Fixed id token parsing in additional user info

Author: scottcrossen

packages-exp/auth-exp/src/core/user/additional_user_info.test.ts

@@ -156,17 +156,15 @@ describe('core/user/additional_user_info', () => {
         expect(username).to.be.null;
         expect(profile).to.eq(profile);
       });
-      /*
-      Uncomment this once ID token parsing is built
+
       it('for missing provider IDs in response but not in token', () => {
-        const additionalUserInfo = fromIdTokenResponse(idTokenResponse({rawUserInfo}))!;
+        const additionalUserInfo = fromIdTokenResponse(idTokenResponse({rawUserInfo: rawUserInfoWithLogin}))!;
         const {isNewUser, providerId, username, profile} = additionalUserInfo;
         expect(isNewUser).to.be.false;
         expect(providerId).to.eq(ProviderId.FACEBOOK);
         expect(username).to.be.null;
         expect(profile).to.eq(profile);
       });
-      */
     });
 
     describe('returns null', () => {

packages-exp/auth-exp/src/core/user/additional_user_info.ts

@@ -17,9 +17,10 @@
 import { AdditionalUserInfo, UserProfile } from '../../model/user';
 import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { ProviderId } from '../providers';
+import { parseToken } from './id_token_result';
 
 export function fromIdTokenResponse(
-  idTokenResponse: IdTokenResponse
+  idTokenResponse: IdTokenResponse,
 ): AdditionalUserInfo | null {
   const { providerId } = idTokenResponse;
   const profile =
@@ -29,13 +30,12 @@ export function fromIdTokenResponse(
   const isNewUser =
     !!idTokenResponse.isNewUser ||
     idTokenResponse.kind === IdTokenResponseKind.SignupNewUser;
-  /*
-  Uncomment this once ID token parsing is built
   if (!providerId && !!idTokenResponse) {
-    const providerId = parseIdToken(idTokenResponse.idToken).signInProvider;
-    return new GenericAdditionalUserInfo(isNewUser, providerId, null, profile);
+    const providerId = parseToken(idTokenResponse.idToken)?.firebase?.['sign_in_provider'] as ProviderId;
+    if (providerId && Object.values(ProviderId).includes(providerId)) {
+      return new GenericAdditionalUserInfo(isNewUser, providerId, null, profile);
+    }
   }
-  */
   if (!providerId) {
     return null;
   }

yarn.lock

@@ -12592,17 +12592,6 @@ [email protected]:
     rollup-pluginutils "2.8.2"
     tslib "1.10.0"
 
-[email protected]:
-  version "0.26.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.26.0.tgz#cee2b44d51d9623686656d76dc30a73c4de91672"
-  integrity sha512-lUK7XZVG77tu8dmv1L/0LZFlavED/5Yo6e4iMMl6fdox/yKdj4IFRRPPJEXNdmEaT1nDQQeCi7b5IwKHffMNeg==
-  dependencies:
-    find-cache-dir "^3.2.0"
-    fs-extra "8.1.0"
-    resolve "1.15.1"
-    rollup-pluginutils "2.8.2"
-    tslib "1.10.0"
-
 [email protected]:
   version "0.27.0"
   resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511"
@@ -12624,13 +12613,6 @@ [email protected]:
     serialize-javascript "^2.1.2"
     uglify-js "^3.4.9"
 
-[email protected]:
-  version "2.8.1"
-  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
-  integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
-  dependencies:
-    estree-walker "^0.6.1"
-
 [email protected], rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"