Allow redirect_uri override in loginWithRedirect (#66)

auth0 · Jul 12, 2019 · 1933b00 · 1933b00
1 parent 051ad6d
commit 1933b00
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/__tests__/index.test.ts b/__tests__/index.test.ts
@@ -293,11 +293,13 @@ describe('Auth0', () => {
     });
     it('creates correct query params when providing a default redirect_uri', async () => {
       const redirect_uri = 'https://custom-redirect-uri/callback';
+      const { redirect_uri: _ignore, ...options } = REDIRECT_OPTIONS;
       const { auth0, utils } = await setup({
         redirect_uri
       });
 
-      await auth0.loginWithRedirect(REDIRECT_OPTIONS);
+      await auth0.loginWithRedirect(options);
+
       expect(utils.createQueryParams).toHaveBeenCalledWith({
         client_id: TEST_CLIENT_ID,
         scope: TEST_SCOPES,
@@ -311,6 +313,27 @@ describe('Auth0', () => {
         connection: 'test-connection'
       });
     });
+    it('creates correct query params when overriding redirect_uri', async () => {
+      const redirect_uri = 'https://custom-redirect-uri/callback';
+      const { auth0, utils } = await setup({
+        redirect_uri
+      });
+
+      await auth0.loginWithRedirect(REDIRECT_OPTIONS);
+
+      expect(utils.createQueryParams).toHaveBeenCalledWith({
+        client_id: TEST_CLIENT_ID,
+        scope: TEST_SCOPES,
+        response_type: TEST_CODE,
+        response_mode: 'query',
+        state: TEST_ENCODED_STATE,
+        nonce: TEST_RANDOM_STRING,
+        redirect_uri: REDIRECT_OPTIONS.redirect_uri,
+        code_challenge: TEST_BASE64_ENCODED_STRING,
+        code_challenge_method: 'S256',
+        connection: 'test-connection'
+      });
+    });
     it('creates correct query params with custom params', async () => {
       const { auth0, utils } = await setup();
 

diff --git a/src/Auth0Client.ts b/src/Auth0Client.ts
@@ -64,7 +64,7 @@ export default class Auth0Client {
       response_mode: 'query',
       state,
       nonce,
-      redirect_uri: this.options.redirect_uri || redirect_uri,
+      redirect_uri: redirect_uri || this.options.redirect_uri,
       code_challenge,
       code_challenge_method: 'S256'
     };
@@ -111,7 +111,7 @@ export default class Auth0Client {
       stateIn,
       nonceIn,
       code_challenge,
-      window.location.origin
+      this.options.redirect_uri || window.location.origin
     );
     const url = this._authorizeUrl({
       ...params,
@@ -311,7 +311,7 @@ export default class Auth0Client {
       stateIn,
       nonceIn,
       code_challenge,
-      window.location.origin
+      this.options.redirect_uri || window.location.origin
     );
     const url = this._authorizeUrl({
       ...params,