fix(redirect): Keep query params when using vue-router

jnt0r · Apr 22, 2023 · de7e2b2 · de7e2b2
1 parent e5851ad
commit de7e2b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -97,14 +97,8 @@ async function initialize (app: App, authClient: Auth0Client): Promise<void> {
         } finally {
             const targetUrl = appState && appState.targetUrl ? appState.targetUrl : '/';
 
-            // Remove query params if vue-router is used
             if (app.config.globalProperties.$router) {
-                const query = Object.assign({}, app.config.globalProperties.$route.query);
-                delete query.state;
-                delete query.code;
-                delete query.error;
-                delete query.error_description;
-                app.config.globalProperties.$router.push({ path: targetUrl, replace: true, query });
+                app.config.globalProperties.$router.push(targetUrl);
             } else {
                 window.location.replace(targetUrl);
             }
@@ -148,8 +142,8 @@ function getIdTokenClaims (): Promise<IdToken | undefined> {
     return client.getIdTokenClaims();
 }
 
-function getTokenSilently(options: GetTokenSilentlyOptions & { detailedResponse: true }): Promise<GetTokenSilentlyVerboseResponse>
-function getTokenSilently(options?: GetTokenSilentlyOptions): Promise<string>
+function getTokenSilently(options: GetTokenSilentlyOptions & { detailedResponse: true }): Promise<GetTokenSilentlyVerboseResponse>;
+function getTokenSilently(options?: GetTokenSilentlyOptions): Promise<string>;
 function getTokenSilently (options?: GetTokenSilentlyOptions): Promise<undefined | string | GetTokenSilentlyVerboseResponse> {
     return client.getTokenSilently(options);
 }

diff --git a/test/plugin.spec.ts b/test/plugin.spec.ts
@@ -126,16 +126,16 @@ describe('initialize', () => {
         Plugin.initialize(app, clientInstance).then(() => {
             verify(client.handleRedirectCallback()).called();
 
-            expect(routerPush).toHaveBeenCalledWith(
-                { path: '/', replace: true, query: { someOtherProperty: 'ShouldStayInState' } });
+            expect(routerPush).toHaveBeenCalledWith('/');
             done();
         });
     });
 
     test('should handle redirect and navigate using router and targetUrl', (done) => {
         const clientInstance = instance(client);
         setQueryValue('?code=code123&state=state456');
-        when(client.handleRedirectCallback()).thenResolve({ appState: { targetUrl: '/testUrl' } });
+        when(client.handleRedirectCallback())
+            .thenResolve({ appState: { targetUrl: '/testUrl?someOtherProperty=ShouldStayInState' } });
 
         // mock vue-router
         const routerPush = jest.fn();
@@ -147,7 +147,6 @@ describe('initialize', () => {
         app.config.globalProperties.$route = {};
         app.config.globalProperties.$router.push = routerPush;
         app.config.globalProperties.$route.query = {
-            someOtherProperty: 'ShouldStayInState',
             code: 'SomeCode',
             state: 'SomeState',
             error: 'SomeError',
@@ -157,8 +156,7 @@ describe('initialize', () => {
         Plugin.initialize(app, clientInstance).then(() => {
             verify(client.handleRedirectCallback()).called();
 
-            expect(routerPush).toHaveBeenCalledWith(
-                { path: '/testUrl', replace: true, query: { someOtherProperty: 'ShouldStayInState' } });
+            expect(routerPush).toHaveBeenCalledWith('/testUrl?someOtherProperty=ShouldStayInState');
             done();
         });
     });