Initial fixes

Author: sam-gc

packages-exp/auth-compat-exp/src/user_credential.ts

@@ -116,10 +116,10 @@ export async function convertConfirmationResult(
   auth: externs.Auth,
   confirmationResultPromise: Promise<externs.ConfirmationResult>
 ): Promise<compat.ConfirmationResult> {
-  const { verificationId, confirm } = await confirmationResultPromise;
+  const confirmationResultExp = await confirmationResultPromise;
   return {
-    verificationId,
+    verificationId: confirmationResultExp.verificationId,
     confirm: (verificationCode: string) =>
-      convertCredential(auth, confirm(verificationCode))
+      convertCredential(auth, confirmationResultExp.confirm(verificationCode))
   };
 }

packages-exp/auth-exp/src/api/authentication/custom_token.ts

@@ -21,6 +21,7 @@ import { Auth } from '@firebase/auth-types-exp';
 
 export interface SignInWithCustomTokenRequest {
   token: string;
+  returnSecureToken: boolean;
 }
 
 export interface SignInWithCustomTokenResponse extends IdTokenResponse {}

packages-exp/auth-exp/src/core/auth/auth_impl.ts

@@ -107,7 +107,7 @@ export class AuthImpl implements Auth, _FirebaseService {
         return;
       }
 
-      await this.initializeCurrentUser();
+      await this.initializeCurrentUser(popupRedirectResolver);
 
       if (this._deleted) {
         return;
@@ -151,7 +151,16 @@ export class AuthImpl implements Auth, _FirebaseService {
     this.notifyAuthListeners();
   }
 
-  private async initializeCurrentUser(): Promise<void> {
+  private async initializeCurrentUser(popupRedirectResolver?: externs.PopupRedirectResolver): Promise<void> {
+    // First check to see if we have a pending redirect event.
+    if (popupRedirectResolver) {
+      await this.getOrInitRedirectPersistenceManager();
+      const result = await this._popupRedirectResolver!._completeRedirectFn(this, popupRedirectResolver);
+      if (result) {
+        return;
+      };
+    }
+
     const storedUser = (await this.assertedPersistence.getCurrentUser()) as User | null;
     if (!storedUser) {
       return this.directlySetCurrentUser(storedUser);
@@ -227,10 +236,10 @@ export class AuthImpl implements Auth, _FirebaseService {
       }
     );
 
-    return this._updateCurrentUser(user && user._clone());
+    return this._updateCurrentUser(user && user._clone(), false);
   }
 
-  async _updateCurrentUser(user: externs.User | null): Promise<void> {
+  async _updateCurrentUser(user: externs.User | null, isInternal = true): Promise<void> {
     if (this._deleted) {
       return;
     }
@@ -241,10 +250,21 @@ export class AuthImpl implements Auth, _FirebaseService {
         { appName: this.name }
       );
     }
-    return this.queue(async () => {
+
+    const action = async (): Promise<void> => {
       await this.directlySetCurrentUser(user as User | null);
       this.notifyAuthListeners();
-    });
+    };
+    
+    // Bypass the queue if this is an internal invocation and initialization is
+    // incomplete. This state only occurs if there's a pending redirect
+    // operation. That redirect operation was invoked from within the queue,
+    // meaning that we're safe to directly set the user
+    if (isInternal && !this._isInitialized) {
+      return action();
+    }
+
+    return this.queue(action);
   }
 
   async signOut(): Promise<void> {
@@ -253,7 +273,7 @@ export class AuthImpl implements Auth, _FirebaseService {
       await this._setRedirectUser(null);
     }
 
-    return this._updateCurrentUser(null);
+    return this._updateCurrentUser(null, false);
   }
 
   setPersistence(persistence: externs.Persistence): Promise<void> {
@@ -333,8 +353,11 @@ export class AuthImpl implements Auth, _FirebaseService {
   }
 
   async _redirectUserForId(id: string): Promise<User | null> {
-    // Make sure we've cleared any pending ppersistence actions
-    await this.queue(async () => {});
+    // Make sure we've cleared any pending ppersistence actions if we're not in
+    // the initializer
+    if (this._isInitialized) {
+      await this.queue(async () => {});
+    }
 
     if (this._currentUser?._redirectEventId === id) {
       return this._currentUser;
@@ -349,7 +372,11 @@ export class AuthImpl implements Auth, _FirebaseService {
 
   async _persistUserIfCurrent(user: User): Promise<void> {
     if (user === this.currentUser) {
-      return this.queue(async () => this.directlySetCurrentUser(user));
+      if (!this._isInitialized) {
+        return this.directlySetCurrentUser(user);
+      } else {
+        return this.queue(async () => this.directlySetCurrentUser(user));
+      }
     }
   }
 

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

@@ -27,7 +27,8 @@ export async function signInWithCustomToken(
   customToken: string
 ): Promise<externs.UserCredential> {
   const response: IdTokenResponse = await getIdTokenResponse(authExtern, {
-    token: customToken
+    token: customToken,
+    returnSecureToken: true,
   });
   const auth = _castAuth(authExtern);
   const cred = await UserCredentialImpl._fromIdTokenResponse(

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

@@ -42,10 +42,11 @@ export function _fromIdTokenResponse(
     ];
     if (signInProvider) {
       const filteredProviderId =
-        providerId !== externs.ProviderId.ANONYMOUS &&
-        providerId !== externs.ProviderId.CUSTOM
+        signInProvider !== externs.ProviderId.ANONYMOUS &&
+        signInProvider !== externs.ProviderId.CUSTOM
           ? (signInProvider as externs.ProviderId)
           : null;
+      console.log('In first branch');
       // Uses generic class in accordance with the legacy SDK.
       return new GenericAdditionalUserInfo(isNewUser, filteredProviderId);
     }
@@ -68,8 +69,10 @@ export function _fromIdTokenResponse(
       );
     case externs.ProviderId.CUSTOM:
     case externs.ProviderId.ANONYMOUS:
+      console.log('In second branch');
       return new GenericAdditionalUserInfo(isNewUser, null);
     default:
+      console.log('In third branch');
       return new GenericAdditionalUserInfo(isNewUser, providerId, profile);
   }
 }
@@ -79,7 +82,9 @@ class GenericAdditionalUserInfo implements externs.AdditionalUserInfo {
     readonly isNewUser: boolean,
     readonly providerId: externs.ProviderId | null,
     readonly profile: externs.UserProfile = {}
-  ) {}
+  ) {
+    console.log('In constructor');
+  }
 }
 
 class FederatedAdditionalUserInfoWithUsername extends GenericAdditionalUserInfo {
@@ -140,5 +145,10 @@ export function getAdditionalUserInfo(
     };
   }
 
-  return _fromIdTokenResponse(_tokenResponse);
+
+  const result = _fromIdTokenResponse(_tokenResponse);
+  if (result?.providerId === 'anonymous') {
+    throw new Error(JSON.stringify(result));
+  }
+  return result;
 }

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

@@ -46,6 +46,13 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
   const newProviderData = coreAccount.providerUserInfo?.length
     ? extractProviderData(coreAccount.providerUserInfo)
     : [];
+
+  const providerData = mergeProviderData(user.providerData, newProviderData);
+
+  const oldIsAnonymous = user.isAnonymous;
+  const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !(providerData?.length);
+  const isAnonymous = !oldIsAnonymous ? false : newIsAnonymous;
+
   const updates: Partial<User> = {
     uid: coreAccount.localId,
     displayName: coreAccount.displayName || null,
@@ -54,8 +61,9 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
     emailVerified: coreAccount.emailVerified || false,
     phoneNumber: coreAccount.phoneNumber || null,
     tenantId: coreAccount.tenantId || null,
-    providerData: mergeProviderData(user.providerData, newProviderData),
-    metadata: new UserMetadata(coreAccount.createdAt, coreAccount.lastLoginAt)
+    providerData,
+    metadata: new UserMetadata(coreAccount.createdAt, coreAccount.lastLoginAt),
+    isAnonymous,
   };
 
   Object.assign(user, updates);

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

@@ -21,7 +21,7 @@ import { Auth } from '../../model/auth';
 import { IdTokenResponse } from '../../model/id_token';
 import { AuthErrorCode } from '../errors';
 import { PersistedBlob } from '../persistence';
-import { assert, debugFail } from '../util/assert';
+import { assert, debugFail, fail } from '../util/assert';
 
 /**
  * The number of milliseconds before the official expiration time of a token
@@ -56,14 +56,13 @@ export class StsTokenManager {
       return this.accessToken;
     }
 
-    if (!this.refreshToken) {
-      assert(!this.accessToken, AuthErrorCode.TOKEN_EXPIRED, {
+    if (this.accessToken && !this.refreshToken) {
+      fail(AuthErrorCode.TOKEN_EXPIRED, {
         appName: auth.name
       });
-      return null;
     }
 
-    await this.refresh(auth, this.refreshToken);
+    await this.refresh(auth, this.refreshToken!);
     return this.accessToken;
   }
 

packages-exp/auth-exp/src/model/popup_redirect.ts

@@ -92,4 +92,7 @@ export interface PopupRedirectResolver extends externs.PopupRedirectResolver {
     cb: (support: boolean) => unknown
   ): void;
   _redirectPersistence: externs.Persistence;
+
+  // This is needed so that auth does not have a hard dependency on redirect
+  _completeRedirectFn: (auth: externs.Auth, resolver: externs.PopupRedirectResolver) => Promise<externs.UserCredential | null>;
 }

packages-exp/auth-exp/src/platform_browser/popup_redirect.ts

@@ -40,6 +40,7 @@ import { _setWindowLocation } from './auth_window';
 import { _openIframe } from './iframe/iframe';
 import { browserSessionPersistence } from './persistence/session_storage';
 import { _open, AuthPopup } from './util/popup';
+import { getRedirectResult } from './strategies/redirect';
 
 /**
  * URL for Authentication widget which will initiate the OAuth handshake
@@ -190,6 +191,8 @@ class BrowserPopupRedirectResolver implements PopupRedirectResolver {
 
     return this.originValidationPromises[key];
   }
+
+  _completeRedirectFn = getRedirectResult;
 }
 
 export const browserPopupRedirectResolver: externs.PopupRedirectResolver = BrowserPopupRedirectResolver;

packages-exp/auth-exp/src/platform_browser/strategies/redirect.ts

@@ -103,14 +103,19 @@ export async function getRedirectResult(
   const auth = _castAuth(authExtern);
   const resolver = _withDefaultResolver(auth, resolverExtern);
   const action = new RedirectAction(auth, resolver);
+  console.log('Executing redirect action');
   const result = await action.execute();
 
   if (result) {
     delete result.user._redirectEventId;
+    console.log('Persisting user');
     await auth._persistUserIfCurrent(result.user as User);
+    console.log('Updating redirect user');
     await auth._setRedirectUser(null, resolverExtern);
+    console.log('Finished');
   }
 
+  console.log('Finished with total');
   return result;
 }