[Auth] Add conversion function to all modular SDK entry points (#4677)

* [Auth] Add conversion function to all modular SDK entry points

* Formatting

* Add missing method

* Formatting

Author: sam-gc

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

@@ -34,6 +34,7 @@ import {
 import {
   createSubscribe,
   ErrorFactory,
+  getModularInstance,
   Observer,
   Subscribe
 } from '@firebase/util';
@@ -298,7 +299,9 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
   async updateCurrentUser(userExtern: User | null): Promise<void> {
     // The public updateCurrentUser method needs to make a copy of the user,
     // and also check that the project matches
-    const user = userExtern as UserInternal | null;
+    const user = userExtern
+      ? (getModularInstance(userExtern) as UserInternal)
+      : null;
     if (user) {
       _assert(
         user.auth.config.apiKey === this.config.apiKey,
@@ -556,12 +559,13 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
 }
 
 /**
- * Method to be used to cast down to our private implmentation of Auth
+ * Method to be used to cast down to our private implmentation of Auth.
+ * It will also handle unwrapping from the compat type if necessary
  *
  * @param auth Auth object passed in from developer
  */
 export function _castAuth(auth: Auth): AuthInternal {
-  return (auth as unknown) as AuthInternal;
+  return getModularInstance(auth) as AuthInternal;
 }
 
 /** Helper class to wrap subscriber logic */

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { getModularInstance } from '@firebase/util';
 import {
   Auth,
   NextOrObserver,
@@ -53,7 +54,7 @@ export function setPersistence(
   auth: Auth,
   persistence: Persistence
 ): Promise<void> {
-  return auth.setPersistence(persistence);
+  return getModularInstance(auth).setPersistence(persistence);
 }
 /**
  * Adds an observer for changes to the signed-in user's ID token, which includes sign-in,
@@ -72,7 +73,11 @@ export function onIdTokenChanged(
   error?: ErrorFn,
   completed?: CompleteFn
 ): Unsubscribe {
-  return auth.onIdTokenChanged(nextOrObserver, error, completed);
+  return getModularInstance(auth).onIdTokenChanged(
+    nextOrObserver,
+    error,
+    completed
+  );
 }
 /**
  * Adds an observer for changes to the user's sign-in state.
@@ -93,7 +98,11 @@ export function onAuthStateChanged(
   error?: ErrorFn,
   completed?: CompleteFn
 ): Unsubscribe {
-  return auth.onAuthStateChanged(nextOrObserver, error, completed);
+  return getModularInstance(auth).onAuthStateChanged(
+    nextOrObserver,
+    error,
+    completed
+  );
 }
 /**
  * Sets the current language to the default device/browser preference.
@@ -103,7 +112,7 @@ export function onAuthStateChanged(
  * @public
  */
 export function useDeviceLanguage(auth: Auth): void {
-  auth.useDeviceLanguage();
+  getModularInstance(auth).useDeviceLanguage();
 }
 /**
  * Asynchronously sets the provided user as {@link Auth.currentUser} on the
@@ -127,7 +136,7 @@ export function updateCurrentUser(
   auth: Auth,
   user: User | null
 ): Promise<void> {
-  return auth.updateCurrentUser(user);
+  return getModularInstance(auth).updateCurrentUser(user);
 }
 /**
  * Signs out the current user.
@@ -137,7 +146,7 @@ export function updateCurrentUser(
  * @public
  */
 export function signOut(auth: Auth): Promise<void> {
-  return auth.signOut();
+  return getModularInstance(auth).signOut();
 }
 
 export { initializeAuth } from './auth/initialize';
@@ -218,5 +227,5 @@ export { reload } from './user/reload';
  * @public
  */
 export async function deleteUser(user: User): Promise<void> {
-  return user.delete();
+  return getModularInstance(user).delete();
 }

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

@@ -30,6 +30,7 @@ import { _assertLinkedStatus, _link } from '../user/link_unlink';
 import { _reauthenticate } from '../user/reauthenticate';
 import { UserCredentialImpl } from '../user/user_credential_impl';
 import { _castAuth } from '../auth/auth_impl';
+import { getModularInstance } from '@firebase/util';
 
 export async function _signInWithCredential(
   auth: AuthInternal,
@@ -87,7 +88,7 @@ export async function linkWithCredential(
   user: User,
   credential: AuthCredential
 ): Promise<UserCredential> {
-  const userInternal = user as UserInternal;
+  const userInternal = getModularInstance(user) as UserInternal;
 
   await _assertLinkedStatus(false, userInternal, credential.providerId);
 
@@ -110,5 +111,5 @@ export async function reauthenticateWithCredential(
   user: User,
   credential: AuthCredential
 ): Promise<UserCredential> {
-  return _reauthenticate(user as UserInternal, credential);
+  return _reauthenticate(getModularInstance(user) as UserInternal, credential);
 }

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

@@ -42,11 +42,11 @@ export async function signInWithCustomToken(
   auth: Auth,
   customToken: string
 ): Promise<UserCredential> {
-  const response: IdTokenResponse = await getIdTokenResponse(auth, {
+  const authInternal = _castAuth(auth);
+  const response: IdTokenResponse = await getIdTokenResponse(authInternal, {
     token: customToken,
     returnSecureToken: true
   });
-  const authInternal = _castAuth(auth);
   const cred = await UserCredentialImpl._fromIdTokenResponse(
     authInternal,
     OperationType.SIGN_IN,

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

@@ -30,6 +30,7 @@ import * as api from '../../api/authentication/email_and_password';
 import { UserInternal } from '../../model/user';
 import { _getCurrentUrl, _isHttpOrHttps } from '../util/location';
 import { _setActionCodeSettingsOnRequest } from './action_code_settings';
+import { getModularInstance } from '@firebase/util';
 
 /**
  * Gets the list of possible sign in methods for the given email address.
@@ -58,7 +59,10 @@ export async function fetchSignInMethodsForEmail(
     continueUri
   };
 
-  const { signinMethods } = await createAuthUri(auth, request);
+  const { signinMethods } = await createAuthUri(
+    getModularInstance(auth),
+    request
+  );
 
   return signinMethods || [];
 }
@@ -97,7 +101,7 @@ export async function sendEmailVerification(
   user: User,
   actionCodeSettings?: ActionCodeSettings | null
 ): Promise<void> {
-  const userInternal = user as UserInternal;
+  const userInternal = getModularInstance(user) as UserInternal;
   const idToken = await user.getIdToken();
   const request: api.VerifyEmailRequest = {
     requestType: ActionCodeOperation.VERIFY_EMAIL,
@@ -157,7 +161,7 @@ export async function verifyBeforeUpdateEmail(
   newEmail: string,
   actionCodeSettings?: ActionCodeSettings | null
 ): Promise<void> {
-  const userInternal = user as UserInternal;
+  const userInternal = getModularInstance(user) as UserInternal;
   const idToken = await user.getIdToken();
   const request: api.VerifyAndChangeEmailRequest = {
     requestType: ActionCodeOperation.VERIFY_AND_CHANGE_EMAIL,

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

@@ -35,6 +35,7 @@ import { _setActionCodeSettingsOnRequest } from './action_code_settings';
 import { signInWithCredential } from './credential';
 import { _castAuth } from '../auth/auth_impl';
 import { AuthErrorCode } from '../errors';
+import { getModularInstance } from '@firebase/util';
 
 /**
  * Sends a password reset email to the given email address.
@@ -73,15 +74,16 @@ export async function sendPasswordResetEmail(
   email: string,
   actionCodeSettings?: ActionCodeSettings
 ): Promise<void> {
+  const authModular = getModularInstance(auth);
   const request: authentication.PasswordResetRequest = {
     requestType: ActionCodeOperation.PASSWORD_RESET,
     email
   };
   if (actionCodeSettings) {
-    _setActionCodeSettingsOnRequest(auth, request, actionCodeSettings);
+    _setActionCodeSettingsOnRequest(authModular, request, actionCodeSettings);
   }
 
-  await authentication.sendPasswordResetEmail(auth, request);
+  await authentication.sendPasswordResetEmail(authModular, request);
 }
 
 /**
@@ -98,7 +100,7 @@ export async function confirmPasswordReset(
   oobCode: string,
   newPassword: string
 ): Promise<void> {
-  await account.resetPassword(auth, {
+  await account.resetPassword(getModularInstance(auth), {
     oobCode,
     newPassword
   });
@@ -117,7 +119,7 @@ export async function applyActionCode(
   auth: Auth,
   oobCode: string
 ): Promise<void> {
-  await account.applyActionCode(auth, { oobCode });
+  await account.applyActionCode(getModularInstance(auth), { oobCode });
 }
 
 /**
@@ -134,7 +136,8 @@ export async function checkActionCode(
   auth: Auth,
   oobCode: string
 ): Promise<ActionCodeInfo> {
-  const response = await account.resetPassword(auth, { oobCode });
+  const authModular = getModularInstance(auth);
+  const response = await account.resetPassword(authModular, { oobCode });
 
   // Email could be empty only if the request type is EMAIL_SIGNIN or
   // VERIFY_AND_CHANGE_EMAIL.
@@ -143,25 +146,25 @@ export async function checkActionCode(
   // Multi-factor info could not be empty if the request type is
   // REVERT_SECOND_FACTOR_ADDITION.
   const operation = response.requestType;
-  _assert(operation, auth, AuthErrorCode.INTERNAL_ERROR);
+  _assert(operation, authModular, AuthErrorCode.INTERNAL_ERROR);
   switch (operation) {
     case ActionCodeOperation.EMAIL_SIGNIN:
       break;
     case ActionCodeOperation.VERIFY_AND_CHANGE_EMAIL:
-      _assert(response.newEmail, auth, AuthErrorCode.INTERNAL_ERROR);
+      _assert(response.newEmail, authModular, AuthErrorCode.INTERNAL_ERROR);
       break;
     case ActionCodeOperation.REVERT_SECOND_FACTOR_ADDITION:
-      _assert(response.mfaInfo, auth, AuthErrorCode.INTERNAL_ERROR);
+      _assert(response.mfaInfo, authModular, AuthErrorCode.INTERNAL_ERROR);
     // fall through
     default:
-      _assert(response.email, auth, AuthErrorCode.INTERNAL_ERROR);
+      _assert(response.email, authModular, AuthErrorCode.INTERNAL_ERROR);
   }
 
   // The multi-factor info for revert second factor addition
   let multiFactorInfo: MultiFactorInfoImpl | null = null;
   if (response.mfaInfo) {
     multiFactorInfo = MultiFactorInfoImpl._fromServerResponse(
-      _castAuth(auth),
+      _castAuth(authModular),
       response.mfaInfo
     );
   }
@@ -196,7 +199,7 @@ export async function verifyPasswordResetCode(
   auth: Auth,
   code: string
 ): Promise<string> {
-  const { data } = await checkActionCode(auth, code);
+  const { data } = await checkActionCode(getModularInstance(auth), code);
   // Email should always be present since a code was sent to it
   return data.email!;
 }
@@ -224,7 +227,7 @@ export async function createUserWithEmailAndPassword(
   password: string
 ): Promise<UserCredential> {
   const authInternal = _castAuth(auth);
-  const response = await signUp(auth, {
+  const response = await signUp(authInternal, {
     returnSecureToken: true,
     email,
     password
@@ -262,7 +265,7 @@ export function signInWithEmailAndPassword(
   password: string
 ): Promise<UserCredential> {
   return signInWithCredential(
-    auth,
+    getModularInstance(auth),
     EmailAuthProvider.credential(email, password)
   );
 }

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

@@ -30,6 +30,7 @@ import { _setActionCodeSettingsOnRequest } from './action_code_settings';
 import { signInWithCredential } from './credential';
 import { AuthErrorCode } from '../errors';
 import { _assert } from '../util/assert';
+import { getModularInstance } from '@firebase/util';
 
 /**
  * Sends a sign-in email link to the user with the specified email.
@@ -63,7 +64,7 @@ import { _assert } from '../util/assert';
  * }
  * ```
  *
- * @param auth - The Auth instance.
+ * @param authInternal - The Auth instance.
  * @param email - The user's email address.
  * @param actionCodeSettings - The {@link ActionCodeSettings}.
  *
@@ -74,20 +75,21 @@ export async function sendSignInLinkToEmail(
   email: string,
   actionCodeSettings?: ActionCodeSettings
 ): Promise<void> {
+  const authModular = getModularInstance(auth);
   const request: api.EmailSignInRequest = {
     requestType: ActionCodeOperation.EMAIL_SIGNIN,
     email
   };
   _assert(
     actionCodeSettings?.handleCodeInApp,
-    auth,
+    authModular,
     AuthErrorCode.ARGUMENT_ERROR
   );
   if (actionCodeSettings) {
-    _setActionCodeSettingsOnRequest(auth, request, actionCodeSettings);
+    _setActionCodeSettingsOnRequest(authModular, request, actionCodeSettings);
   }
 
-  await api.sendSignInLinkToEmail(auth, request);
+  await api.sendSignInLinkToEmail(authModular, request);
 }
 
 /**
@@ -145,16 +147,17 @@ export async function signInWithEmailLink(
   email: string,
   emailLink?: string
 ): Promise<UserCredential> {
+  const authModular = getModularInstance(auth);
   const credential = EmailAuthProvider.credentialWithLink(
     email,
     emailLink || _getCurrentUrl()
   );
   // Check if the tenant ID in the email link matches the tenant ID on Auth
   // instance.
   _assert(
-    credential.tenantId === (auth.tenantId || null),
-    auth,
+    credential.tenantId === (authModular.tenantId || null),
+    authModular,
     AuthErrorCode.TENANT_ID_MISMATCH
   );
-  return signInWithCredential(auth, credential);
+  return signInWithCredential(authModular, credential);
 }