Merge pull request #381 from auth0/fixed-email-password-popup-stuck

Pass to popup the needed params for auth
auth0 · Mar 9, 2017 · 82e5de1 · 82e5de1
2 parents 5e5f423 + 2979ad2
commit 82e5de1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/src/web-auth/popup.js b/src/web-auth/popup.js
@@ -188,13 +188,14 @@ Popup.prototype.loginWithCredentials = function (options, cb) {
 
   params = objectHelper.pick(options, ['clientID', 'domain']);
   params.options = objectHelper.toSnakeCase(
-    objectHelper.blacklist(options, ['clientID', 'domain'])
+    objectHelper.pick(options, ['password', 'connection', 'state', 'scope', '_csrf', 'device'])
   );
+  params.options.username = options.username || options.email;
 
   url = urljoin(this.baseOptions.rootUrl, 'sso_dbconnection_popup', options.clientID);
   relayUrl = urljoin(this.baseOptions.rootUrl, 'relay.html');
 
-  return popup.load(url, relayUrl, params, responseHandler(cb));
+  return popup.load(url, relayUrl, { params: params }, responseHandler(cb));
 };
 
 /**

diff --git a/test/web-auth/popup.test.js b/test/web-auth/popup.test.js
@@ -136,15 +136,17 @@ describe('auth0.WebAuth.popup', function () {
       stub(PopupHandler.prototype, 'load', function(url, relayUrl, options, cb) {
         expect(url).to.be('https://me.auth0.com/sso_dbconnection_popup/...');
         expect(relayUrl).to.be('https://me.auth0.com/relay.html');
-        expect(options).to.eql({ clientID: '...',
-          domain: 'me.auth0.com',
-          options:{
-            connection: 'the_connection',
-            nonce: '123',
-            state: '456',
-            username: 'theUsername',
-            password: 'thepassword',
-            scope: 'openid'
+        expect(options).to.eql({
+          params: {
+            clientID: '...',
+            domain: 'me.auth0.com',
+            options:{
+              connection: 'the_connection',
+              state: '456',
+              username: 'theUsername',
+              password: 'thepassword',
+              scope: 'openid'
+            }
           }
         });
 
@@ -156,7 +158,6 @@ describe('auth0.WebAuth.popup', function () {
 
       this.auth0.popup.loginWithCredentials({
         connection: 'the_connection',
-        nonce: '123',
         state: '456',
         username: 'theUsername',
         password: 'thepassword',
@@ -385,13 +386,16 @@ describe('auth0.WebAuth.popup', function () {
       stub(PopupHandler.prototype, 'load', function(url, relayUrl, options, cb) {
         expect(url).to.be('https://me.auth0.com/sso_dbconnection_popup/...');
         expect(relayUrl).to.be('https://me.auth0.com/relay.html');
-        expect(options).to.eql({ clientID: '...',
-          domain: 'me.auth0.com',
-          options:{
-            connection: 'the_connection',
-            email: 'me@example.com',
-            password: '123456',
-            scope: 'openid'
+        expect(options).to.eql({
+          params: {
+            clientID: '...',
+            domain: 'me.auth0.com',
+            options:{
+              connection: 'the_connection',
+              username: 'me@example.com',
+              password: '123456',
+              scope: 'openid'
+            }
           }
         });