Merge pull request taskcluster#525 from djmitche/bug1536863-c

Bug 1536863 - be a little more flexible in reading the chimeric Auth0 profiles
somchi · Apr 1, 2019 · fa98fdd · fa98fdd
2 parents 57eef35 + 27f2c5c
commit fa98fdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/services/login/src/handlers/mozilla-auth0.js b/services/login/src/handlers/mozilla-auth0.js
@@ -169,9 +169,12 @@ class Handler {
       for (let {provider, connection, profileData} of profile.identities) {
         if (provider === 'oauth2' && connection === 'firefoxaccounts') {
           // we expect the auth0 user_id to be `oauth|firefoxaccounts|<fxa_sub>`
-          assert(user_id.endsWith(profileData.fxa_sub),
+          // sometimes fxa_sub is on profileData, sometimes on the profile
+          const fxa_sub = profileData ? profileData.fxa_sub : profile.fxa_sub;
+          assert(user_id.endsWith(fxa_sub),
             `Auth0 user_id ${user_id} not formatted as expected`);
-          identity += `|${profileData.email}`;
+          const email = profileData ? profileData.email : profile.email;
+          identity += `|${email}`;
           break;
         }
       }

diff --git a/services/login/test/handlers_mozilla_auth0_test.js b/services/login/test/handlers_mozilla_auth0_test.js
@@ -21,8 +21,7 @@ suite('handlers/mozilla-auth0', function() {
     const identities = [
       {provider: 'ad', connection: 'Mozilla-LDAP'},
       {provider: 'github', connection: 'github', user_id: 1234},
-      {provider: 'oauth2', connection: 'firefoxaccounts',
-        profileData: {fxa_sub: 'abcdef', email: 'rockets@ksc'}},
+      {provider: 'oauth2', connection: 'firefoxaccounts'},
       {provider: 'email', connection: 'email', user_id: 'slashy/slashy'},
     ];
     return {
@@ -42,6 +41,8 @@ suite('handlers/mozilla-auth0', function() {
         case 'oauth2|firefoxaccounts|abcdef':
           return {
             user_id: 'oauth2|firefoxaccounts|abcdef',
+            email: 'rockets@ksc',
+            fxa_sub: 'abcdef',
             identities,
           };
         case 'email|slashy/slashy':