Merge pull request #336 from auth0/fix-redirecturi-popup

popup.authorize should not require redirectURI when using OWP
auth0 · Jan 30, 2017 · bbc6e50 · bbc6e50
2 parents 6c98ce0 + 9416847
commit bbc6e50
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/example/index.html b/example/index.html
@@ -261,7 +261,7 @@ <h2>Console:</h2>
       e.preventDefault();
 
       webAuth.popup.loginWithCredentials({
-        connection: 'tests',
+        connection: 'acme',
         username: $('.popup-login-username').val(),
         password: $('.popup-login-password').val(),
         scope: 'openid',

diff --git a/src/authentication/index.js b/src/authentication/index.js
@@ -81,7 +81,7 @@ Authentication.prototype.buildAuthorizeUrl = function (options) {
   /* eslint-disable */
   assert.check(params, { type: 'object', message: 'options parameter is not valid' }, {
     clientID: { type: 'string', message: 'clientID option is required' },
-    redirectUri: { type: 'string', message: 'redirectUri option is required' },
+    redirectUri: { optional: true, type: 'string', message: 'redirectUri option is required' },
     responseType: { type: 'string', message: 'responseType option is required' },
     nonce: { type: 'string', message: 'nonce option is required', condition: function(o) {
       return o.responseType.indexOf('code') === -1 && o.responseType.indexOf('id_token') !== -1;

diff --git a/src/web-auth/popup.js b/src/web-auth/popup.js
@@ -64,18 +64,19 @@ Popup.prototype.authorize = function (options, cb) {
     responseType: { type: 'string', message: 'responseType option is required' }
   });
 
+  relayUrl = urljoin(this.baseOptions.rootUrl, 'relay.html');
+
   // used by server to render the relay page instead of sending the chunk in the
   // url to the callback
   params.owp = true;
+  params.redirectUri = undefined;
 
   params = this.transactionManager.process(params);
 
   url = this.client.buildAuthorizeUrl(params);
 
   popup = this.getPopupHandler(options);
 
-  relayUrl = urljoin(this.baseOptions.rootUrl, 'relay.html');
-
   return popup.load(url, relayUrl, {}, responseHandler(cb));
 };
 

diff --git a/test/web-auth/popup.test.js b/test/web-auth/popup.test.js
@@ -85,7 +85,7 @@ describe('auth0.WebAuth.popup', function () {
 
     it('should open the authorize page in a popup', function (done) {
       stub(PopupHandler.prototype, 'load', function(url, relayUrl, options, cb) {
-        expect(url).to.be('https://me.auth0.com/authorize?client_id=...&response_type=id_token&redirect_uri=http%3A%2F%2Fpage.com%2Fcallback&connection=the_connection&nonce=123&state=456&owp=true');
+        expect(url).to.be('https://me.auth0.com/authorize?client_id=...&response_type=id_token&connection=the_connection&nonce=123&state=456&owp=true');
         expect(relayUrl).to.be('https://me.auth0.com/relay.html');
         expect(options).to.eql({});
         cb(null, {