Fix broken build (#3275)

* Fix some stuff

* Formatting

* fixed scott's broken test cases. Stupid scott

Co-authored-by: Scott Crossen <[email protected]>

Author: sam-gc

packages-exp/auth-exp/src/core/credentials/phone.test.ts

@@ -22,7 +22,7 @@ import { testAuth } from '../../../test/mock_auth';
 import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { Auth } from '../../model/auth';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { PhoneAuthCredential } from '../credentials/phone';
 
 describe('core/credentials/phone', () => {
@@ -41,7 +41,7 @@ describe('core/credentials/phone', () => {
     const response: IdTokenResponse = {
       idToken: '',
       refreshToken: '',
-      kind: '',
+      kind: IdTokenResponseKind.CreateAuthUri,
       expiresIn: '10',
       localId: ''
     };
@@ -81,7 +81,7 @@ describe('core/credentials/phone', () => {
     const response: IdTokenResponse = {
       idToken: '',
       refreshToken: '',
-      kind: '',
+      kind: IdTokenResponseKind.CreateAuthUri,
       expiresIn: '10',
       localId: 'uid'
     };

packages-exp/auth-exp/src/core/strategies/credential.test.ts

@@ -33,7 +33,7 @@ import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { APIUserInfo } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { User } from '../../model/user';
 import {
   linkWithCredential,
@@ -61,7 +61,7 @@ describe('core/strategies/credential', () => {
     refreshToken: 'my-refresh-token',
     expiresIn: '1234',
     localId: serverUser.localId!,
-    kind: 'my-kind'
+    kind: IdTokenResponseKind.CreateAuthUri
   };
 
   const authCredential = new MockAuthCredential(

packages-exp/auth-exp/src/core/strategies/custom_token.test.ts

@@ -26,7 +26,7 @@ import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { APIUserInfo } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { signInWithCustomToken } from './custom_token';
 
 use(chaiAsPromised);
@@ -49,7 +49,7 @@ describe('core/strategies/signInWithCustomToken', () => {
     refreshToken: 'my-refresh-token',
     expiresIn: '1234',
     localId: serverUser.localId!,
-    kind: 'my-kind'
+    kind: IdTokenResponseKind.CreateAuthUri
   };
 
   let auth: Auth;

packages-exp/auth-exp/src/core/strategies/phone.test.ts

@@ -30,7 +30,7 @@ import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { ApplicationVerifier } from '../../model/application_verifier';
 import { Auth } from '../../model/auth';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { User } from '../../model/user';
 import { RecaptchaVerifier } from '../../platform_browser/recaptcha/recaptcha_verifier';
 import {
@@ -87,7 +87,7 @@ describe('core/strategies/phone', () => {
           refreshToken: 'my-refresh-token',
           expiresIn: '1234',
           localId: 'uid',
-          kind: 'my-kind'
+          kind: IdTokenResponseKind.CreateAuthUri
         };
 
         // This endpoint is called from within the callback, in
@@ -163,7 +163,7 @@ describe('core/strategies/phone', () => {
           refreshToken: 'my-refresh-token',
           expiresIn: '1234',
           localId: 'uid',
-          kind: 'my-kind'
+          kind: IdTokenResponseKind.CreateAuthUri
         };
 
         // This endpoint is called from within the callback, in
@@ -227,7 +227,7 @@ describe('core/strategies/phone', () => {
           refreshToken: 'my-refresh-token',
           expiresIn: '1234',
           localId: 'uid',
-          kind: 'my-kind'
+          kind: IdTokenResponseKind.CreateAuthUri
         };
 
         // This endpoint is called from within the callback, in
@@ -261,7 +261,7 @@ describe('core/strategies/phone', () => {
           refreshToken: 'my-refresh-token',
           expiresIn: '1234',
           localId: 'uid',
-          kind: 'my-kind'
+          kind: IdTokenResponseKind.CreateAuthUri
         };
         // This endpoint is called from within the callback, in
         // signInWithCredential

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
  */
 
 import { expect } from 'chai';
-import { _fromIdTokenResponse } from './additional_user_info';
+
+import { ProviderId, UserProfile } from '@firebase/auth-types-exp';
+
 import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
-import {
-  UserProfile,
-  ProviderId
-} from '@firebase/auth-types-exp';
+import { _fromIdTokenResponse } from './additional_user_info';
+import { base64Encode } from '@firebase/util';
 
 describe('core/user/additional_user_info', () => {
   describe('_fromIdTokenResponse', () => {
@@ -48,8 +48,8 @@ describe('core/user/additional_user_info', () => {
         } = _fromIdTokenResponse(idResponse)!;
         expect(isNewUser).to.be.false;
         expect(providerId).to.eq(ProviderId.FACEBOOK);
-        expect(username).to.be.null;
-        expect(profile).to.eq(userProfileWithLogin);
+        expect(username).to.be.undefined;
+        expect(profile).to.eql(userProfileWithLogin);
       });
 
       it('for GithubAdditionalUserInfo', () => {
@@ -66,7 +66,7 @@ describe('core/user/additional_user_info', () => {
         expect(isNewUser).to.be.false;
         expect(providerId).to.eq(ProviderId.GITHUB);
         expect(username).to.eq('scott');
-        expect(profile).to.eq(userProfileWithLogin);
+        expect(profile).to.eql(userProfileWithLogin);
       });
 
       it('for GoogleAdditionalUserInfo', () => {
@@ -82,8 +82,8 @@ describe('core/user/additional_user_info', () => {
         } = _fromIdTokenResponse(idResponse)!;
         expect(isNewUser).to.be.false;
         expect(providerId).to.eq(ProviderId.GOOGLE);
-        expect(username).to.be.null;
-        expect(profile).to.eq(userProfileWithLogin);
+        expect(username).to.be.undefined;
+        expect(profile).to.eql(userProfileWithLogin);
       });
 
       it('for TwitterAdditionalUserInfo', () => {
@@ -159,7 +159,7 @@ describe('core/user/additional_user_info', () => {
         } = _fromIdTokenResponse(idResponse)!;
         expect(isNewUser).to.be.false;
         expect(providerId).to.be.null;
-        expect(username).to.be.null;
+        expect(username).to.be.undefined;
         expect(profile).to.eq(profile);
       });
 
@@ -176,22 +176,23 @@ describe('core/user/additional_user_info', () => {
         } = _fromIdTokenResponse(idResponse)!;
         expect(isNewUser).to.be.false;
         expect(providerId).to.be.null;
-        expect(username).to.be.null;
+        expect(username).to.be.undefined;
         expect(profile).to.eq(profile);
       });
 
       it('for missing provider IDs in response but not in token', () => {
+        const idToken = 'algorithm.' + base64Encode(JSON.stringify({'firebase': {'sign_in_provider': 'facebook.com'}})) + '.signature';
         const {
           isNewUser,
           providerId,
           username,
           profile
         } = _fromIdTokenResponse(
-          idTokenResponse({ rawUserInfo: rawUserInfoWithLogin })
+          idTokenResponse({ rawUserInfo: rawUserInfoWithLogin , idToken})
         )!;
         expect(isNewUser).to.be.false;
         expect(providerId).to.eq(ProviderId.FACEBOOK);
-        expect(username).to.be.null;
+        expect(username).to.be.undefined;
         expect(profile).to.eq(profile);
       });
     });
@@ -208,9 +209,9 @@ describe('core/user/additional_user_info', () => {
 function idTokenResponse(partial: Partial<IdTokenResponse>): IdTokenResponse {
   return {
     idToken: 'id-token',
-    refreshToken: "refresh-token",
-    expiresIn: "expires-in",
-    localId: "local-id",
+    refreshToken: 'refresh-token',
+    expiresIn: 'expires-in',
+    localId: 'local-id',
     kind: IdTokenResponseKind.CreateAuthUri,
     ...partial
   };

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import { _parseToken } from './id_token_result';
  * Parse the `AdditionalUserInfo` from the ID token response.
  */
 export function _fromIdTokenResponse(
-  idTokenResponse: IdTokenResponse,
+  idTokenResponse: IdTokenResponse
 ): AdditionalUserInfo | null {
   const { providerId } = idTokenResponse;
   const profile = idTokenResponse.rawUserInfo
@@ -68,26 +68,22 @@ export function _fromIdTokenResponse(
     case ProviderId.ANONYMOUS:
       return new GenericAdditionalUserInfo(isNewUser, null);
     default:
-      return new FederatedAdditionalUserInfo(
-        isNewUser,
-        providerId,
-        profile
-      );
+      return new FederatedAdditionalUserInfo(isNewUser, providerId, profile);
   }
 }
 
 class GenericAdditionalUserInfo implements AdditionalUserInfo {
   constructor(
     readonly isNewUser: boolean,
-    readonly providerId: ProviderId | null,
+    readonly providerId: ProviderId | null
   ) {}
 }
 
 class FederatedAdditionalUserInfo extends GenericAdditionalUserInfo {
   constructor(
     isNewUser: boolean,
     providerId: ProviderId,
-    readonly profile: UserProfile,
+    readonly profile: UserProfile
   ) {
     super(isNewUser, providerId);
   }
@@ -98,7 +94,7 @@ class FederatedAdditionalUserInfoWithUsername extends FederatedAdditionalUserInf
     isNewUser: boolean,
     providerId: ProviderId,
     profile: UserProfile,
-    readonly username: string | null,
+    readonly username: string | null
   ) {
     super(isNewUser, providerId, profile);
   }

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

@@ -33,7 +33,7 @@ import { MockAuthCredential } from '../../../test/mock_auth_credential';
 import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { APIUserInfo } from '../../api/account_management/account';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { User } from '../../model/user';
 import { AuthCredential } from '../credentials';
 import { UserCredentialImpl } from './user_credential_impl';
@@ -71,7 +71,7 @@ describe('core/user/user_credential_impl', () => {
       refreshToken: 'my-refresh-token',
       expiresIn: '1234',
       localId: serverUser.localId!,
-      kind: 'my-kind'
+      kind: IdTokenResponseKind.CreateAuthUri
     };
 
     const credential: AuthCredential = new MockAuthCredential(

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

@@ -29,7 +29,7 @@ import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { APIUserInfo } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
-import { IdTokenResponse } from '../../model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
 import { StsTokenManager } from './token_manager';
 import { UserImpl } from './user_impl';
 
@@ -197,7 +197,7 @@ describe('core/user/user_impl', () => {
       refreshToken: 'my-refresh-token',
       expiresIn: '1234',
       localId: 'local-id',
-      kind: 'my-kind'
+      kind: IdTokenResponseKind.CreateAuthUri
     };
 
     const serverUser: APIUserInfo = {

packages-exp/auth-exp/src/model/id_token.d.ts

@@ -68,7 +68,7 @@ export interface IdTokenResponse {
 /**
  * The possible types of the `IdTokenResponse`
  */
-export enum IdTokenResponseKind {
+export const enum IdTokenResponseKind {
   CreateAuthUri = 'identitytoolkit#CreateAuthUriResponse',
   DeleteAccount = 'identitytoolkit#DeleteAccountResponse',
   DownloadAccount = 'identitytoolkit#DownloadAccountResponse',

packages-exp/auth-exp/test/id_token_response.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { IdTokenResponse } from '../src/model/id_token';
+import { IdTokenResponse, IdTokenResponseKind } from '../src/model/id_token';
 import { makeJWT } from './jwt';
 
 export const TEST_ID_TOKEN_RESPONSE: IdTokenResponse = {
   idToken: makeJWT({}),
   refreshToken: 'refresh-token',
   expiresIn: '1000',
   localId: 'uid',
-  kind: 'kind'
+  kind: IdTokenResponseKind.CreateAuthUri
 };