@react-native-firebase/auth 25.1.0 → 26.0.0

package/lib/ConfirmationResult.ts

@@ -15,7 +15,7 @@
  *
  */
 
-import type { FirebaseAuthTypes } from './types/namespaced';
+import type { UserCredential } from './types/auth';
 import type { AuthInternal } from './types/internal';
 
 export default class ConfirmationResult {
@@ -27,13 +27,10 @@ export default class ConfirmationResult {
     this._verificationId = verificationId;
   }
 
-  confirm(verificationCode: string): Promise<FirebaseAuthTypes.UserCredential | null> {
+  confirm(verificationCode: string): Promise<UserCredential | null> {
     return this._auth.native
       .confirmationResultConfirm(verificationCode)
-      .then(
-        userCredential =>
-          this._auth._setUserCredential(userCredential) as FirebaseAuthTypes.UserCredential,
-      );
+      .then(userCredential => this._auth._setUserCredential(userCredential) as UserCredential);
   }
 
   get verificationId(): string {

package/lib/MultiFactorResolver.ts

@@ -1,12 +1,12 @@
 /**
  * Base class to facilitate multi-factor authentication.
  */
-import type { FirebaseAuthTypes } from './types/namespaced';
+import type { MultiFactorInfo, MultiFactorSession, UserCredential } from './types/auth';
 import type { AuthInternal } from './types/internal';
 
 type ResolverLike = {
-  hints: FirebaseAuthTypes.MultiFactorInfo[];
-  session: FirebaseAuthTypes.MultiFactorSession;
+  hints: MultiFactorInfo[];
+  session: MultiFactorSession;
 };
 
 type PhoneMultiFactorAssertion = {
@@ -17,8 +17,8 @@ type PhoneMultiFactorAssertion = {
 };
 
 export default class MultiFactorResolver {
-  readonly hints: FirebaseAuthTypes.MultiFactorInfo[];
-  readonly session: FirebaseAuthTypes.MultiFactorSession;
+  readonly hints: MultiFactorInfo[];
+  readonly session: MultiFactorSession;
   private readonly _auth: AuthInternal;
 
   constructor(auth: AuthInternal, resolver: ResolverLike) {
@@ -27,7 +27,7 @@ export default class MultiFactorResolver {
     this.session = resolver.session;
   }
 
-  resolveSignIn(assertion: PhoneMultiFactorAssertion): Promise<FirebaseAuthTypes.UserCredential> {
+  resolveSignIn(assertion: PhoneMultiFactorAssertion): Promise<UserCredential> {
     const { token, secret, uid, verificationCode } = assertion;
 
     if (token && secret) {
@@ -35,7 +35,7 @@ export default class MultiFactorResolver {
         this.session,
         token,
         secret,
-      ) as Promise<FirebaseAuthTypes.UserCredential>;
+      ) as Promise<UserCredential>;
     }
 
     if (uid && verificationCode) {
@@ -43,7 +43,7 @@ export default class MultiFactorResolver {
         this.session,
         uid,
         verificationCode,
-      ) as Promise<FirebaseAuthTypes.UserCredential>;
+      ) as Promise<UserCredential>;
     }
 
     throw new Error('Invalid multi-factor assertion provided for sign-in resolution.');

package/lib/PhoneAuthListener.ts

@@ -23,7 +23,7 @@ import {
 } from '@react-native-firebase/app/dist/module/common';
 import type { ReactNativeFirebase } from '@react-native-firebase/app';
 import NativeFirebaseError from '@react-native-firebase/app/dist/module/internal/NativeFirebaseError';
-import type { FirebaseAuthTypes } from './types/namespaced';
+import type { PhoneAuthSnapshot, PhoneAuthError } from './types/auth';
 import type {
   AuthInternal,
   NativePhoneAuthCredentialInternal,
@@ -38,8 +38,6 @@ type PhoneAuthInternalEventType =
 
 type InternalEvents = Record<PhoneAuthInternalEventType, string>;
 type PublicEvents = Record<'error' | 'event' | 'success', string>;
-type PhoneAuthSnapshot = FirebaseAuthTypes.PhoneAuthSnapshot;
-type PhoneAuthError = FirebaseAuthTypes.PhoneAuthError;
 
 let REQUEST_ID = 0;
 
@@ -235,16 +233,14 @@ export default class PhoneAuthListener {
     const snapshot: PhoneAuthSnapshot = {
       verificationId: state.verificationId,
       code: null,
-      error: null,
+      error: new NativeFirebaseError(
+        { userInfo: state.error },
+        this._jsStack,
+        'auth',
+      ) as ReactNativeFirebase.NativeFirebaseError,
       state: 'error',
     };
 
-    snapshot.error = new NativeFirebaseError(
-      { userInfo: state.error },
-      this._jsStack,
-      'auth',
-    ) as ReactNativeFirebase.NativeFirebaseError;
-
     this._emitToObservers(snapshot);
     this._emitToErrorCb(snapshot);
     this._removeAllListeners();

package/lib/TotpMultiFactorGenerator.ts

@@ -17,7 +17,7 @@
 
 import { isOther } from '@react-native-firebase/app/dist/module/common';
 import { TotpSecret } from './TotpSecret';
-import { getAuth } from './modular';
+import { getAuth } from './index';
 import type { Auth, MultiFactorSession, TotpMultiFactorAssertion } from './types/auth';
 import type { AuthInternal } from './types/internal';
 

package/lib/TotpSecret.ts

@@ -15,6 +15,7 @@
  */
 
 import { isString } from '@react-native-firebase/app/dist/module/common';
+import { rethrowAuthSyncNativeError } from './internal/syncNativeError';
 import type { AuthInternal } from './types/internal';
 
 export class TotpSecret {
@@ -41,17 +42,29 @@ export class TotpSecret {
    *
    * @param accountName the name of the account/app along with a user identifier.
    * @param issuer issuer of the TOTP (likely the app name).
-   * @returns A Promise that resolves to a QR code URL string. Unlike the firebase-js-sdk synchronous
-   * return type, this method is async because QR code generation is performed through the React Native
-   * native auth bridge.
+   * @returns A QR code URL string.
    */
-  async generateQrCodeUrl(accountName?: string, issuer?: string): Promise<string> {
-    // accountName and issure are nullable in the API specification but are
-    // required by tha native SDK. The JS SDK returns '' if they are missing/empty.
-    if (!isString(accountName) || !isString(issuer) || accountName === '' || issuer === '') {
-      return '';
+  generateQrCodeUrl(accountName?: string, issuer?: string): string {
+    let resolvedAccountName = accountName;
+    let resolvedIssuer = issuer;
+
+    if (!isString(resolvedAccountName) || resolvedAccountName === '') {
+      resolvedAccountName = this.auth.currentUser?.email ?? 'unknownuser';
+    }
+
+    if (!isString(resolvedIssuer) || resolvedIssuer === '') {
+      resolvedIssuer = this.auth.app.name;
+    }
+
+    try {
+      return this.auth.native.generateQrCodeUrl(
+        this.secretKey,
+        resolvedAccountName,
+        resolvedIssuer,
+      );
+    } catch (error) {
+      rethrowAuthSyncNativeError(error);
     }
-    return this.auth.native.generateQrCodeUrl(this.secretKey, accountName, issuer);
   }
 
   /**

package/lib/User.ts

@@ -22,10 +22,17 @@ import {
   isBoolean,
 } from '@react-native-firebase/app/dist/module/common';
 import type { IdTokenResult, UserInfo, UserMetadata } from './types/auth';
-import type { FirebaseAuthTypes } from './types/namespaced';
+import type {
+  AuthProvider,
+  AuthCredential,
+  ActionCodeSettings,
+  MultiFactor,
+  UpdateProfile,
+  UserCredential,
+} from './types/auth';
 import type { AuthInternal, NativeUserInternal } from './types/internal';
 
-type AuthProviderWithObject = FirebaseAuthTypes.AuthProvider & {
+type AuthProviderWithObject = AuthProvider & {
   toObject(): Record<string, unknown>;
 };
 
@@ -65,7 +72,7 @@ export default class User {
     };
   }
 
-  get multiFactor(): FirebaseAuthTypes.MultiFactor | null {
+  get multiFactor(): MultiFactor | null {
     return this._user.multiFactor || null;
   }
 
@@ -101,7 +108,7 @@ export default class User {
   }
 
   delete(): Promise<void> {
-    return this._auth.native.delete().then(() => {
+    return this._auth.native.deleteUser().then(() => {
       this._auth._setUser(null);
     });
   }
@@ -114,52 +121,34 @@ export default class User {
     return this._auth.native.getIdTokenResult(forceRefresh) as Promise<IdTokenResult>;
   }
 
-  linkWithCredential(
-    credential: FirebaseAuthTypes.AuthCredential,
-  ): Promise<FirebaseAuthTypes.UserCredential> {
+  linkWithCredential(credential: AuthCredential): Promise<UserCredential> {
     return this._auth.native
       .linkWithCredential(credential.providerId, credential.token, credential.secret)
-      .then(
-        userCredential =>
-          this._auth._setUserCredential(userCredential) as FirebaseAuthTypes.UserCredential,
-      );
+      .then(userCredential => this._auth._setUserCredential(userCredential) as UserCredential);
   }
 
-  linkWithPopup(provider: AuthProviderWithObject): Promise<FirebaseAuthTypes.UserCredential> {
+  linkWithPopup(provider: AuthProviderWithObject): Promise<UserCredential> {
     // call through to linkWithRedirect for shared implementation
     return this.linkWithRedirect(provider);
   }
 
-  linkWithRedirect(provider: AuthProviderWithObject): Promise<FirebaseAuthTypes.UserCredential> {
+  linkWithRedirect(provider: AuthProviderWithObject): Promise<UserCredential> {
     return this._auth.native
       .linkWithProvider(provider.toObject())
-      .then(
-        userCredential =>
-          this._auth._setUserCredential(userCredential) as FirebaseAuthTypes.UserCredential,
-      );
+      .then(userCredential => this._auth._setUserCredential(userCredential) as UserCredential);
   }
 
-  reauthenticateWithCredential(
-    credential: FirebaseAuthTypes.AuthCredential,
-  ): Promise<FirebaseAuthTypes.UserCredential> {
+  reauthenticateWithCredential(credential: AuthCredential): Promise<UserCredential> {
     return this._auth.native
       .reauthenticateWithCredential(credential.providerId, credential.token, credential.secret)
-      .then(
-        userCredential =>
-          this._auth._setUserCredential(userCredential) as FirebaseAuthTypes.UserCredential,
-      );
+      .then(userCredential => this._auth._setUserCredential(userCredential) as UserCredential);
   }
 
-  reauthenticateWithPopup(
-    provider: AuthProviderWithObject,
-  ): Promise<FirebaseAuthTypes.UserCredential> {
+  reauthenticateWithPopup(provider: AuthProviderWithObject): Promise<UserCredential> {
     // call through to reauthenticateWithRedirect for shared implementation
     return this._auth.native
       .reauthenticateWithProvider(provider.toObject())
-      .then(
-        userCredential =>
-          this._auth._setUserCredential(userCredential) as FirebaseAuthTypes.UserCredential,
-      );
+      .then(userCredential => this._auth._setUserCredential(userCredential) as UserCredential);
   }
 
   reauthenticateWithRedirect(provider: AuthProviderWithObject): Promise<void> {
@@ -176,9 +165,9 @@ export default class User {
     });
   }
 
-  sendEmailVerification(actionCodeSettings?: FirebaseAuthTypes.ActionCodeSettings): Promise<void> {
+  sendEmailVerification(actionCodeSettings?: ActionCodeSettings): Promise<void> {
     if (isObject(actionCodeSettings)) {
-      const settings = actionCodeSettings as FirebaseAuthTypes.ActionCodeSettings;
+      const settings = actionCodeSettings as ActionCodeSettings;
 
       if (!isString(settings.url)) {
         throw new Error(
@@ -249,7 +238,7 @@ export default class User {
     return Object.assign({}, this._user);
   }
 
-  unlink(providerId: string): Promise<FirebaseAuthTypes.User> {
+  unlink(providerId: string): Promise<import('./types/auth').User> {
     return this._auth.native.unlink(providerId).then(user => {
       const updatedUser = this._auth._setUser(user);
       if (!updatedUser) {
@@ -271,7 +260,7 @@ export default class User {
     });
   }
 
-  updatePhoneNumber(credential: FirebaseAuthTypes.AuthCredential): Promise<void> {
+  updatePhoneNumber(credential: AuthCredential): Promise<void> {
     return this._auth.native
       .updatePhoneNumber(credential.providerId, credential.token, credential.secret)
       .then(user => {
@@ -279,7 +268,7 @@ export default class User {
       });
   }
 
-  updateProfile(updates: FirebaseAuthTypes.UpdateProfile): Promise<void> {
+  updateProfile(updates: UpdateProfile): Promise<void> {
     return this._auth.native.updateProfile(updates).then(user => {
       this._auth._setUser(user);
     });
@@ -287,7 +276,7 @@ export default class User {
 
   verifyBeforeUpdateEmail(
     newEmail: string,
-    actionCodeSettings?: FirebaseAuthTypes.ActionCodeSettings,
+    actionCodeSettings?: ActionCodeSettings,
   ): Promise<void> {
     if (!isString(newEmail)) {
       throw new Error(
@@ -296,7 +285,7 @@ export default class User {
     }
 
     if (isObject(actionCodeSettings)) {
-      const settings = actionCodeSettings as FirebaseAuthTypes.ActionCodeSettings;
+      const settings = actionCodeSettings as ActionCodeSettings;
 
       if (!isString(settings.url)) {
         throw new Error(

package/lib/getMultiFactorResolver.ts

@@ -1,13 +1,13 @@
 import { isOther } from '@react-native-firebase/app/dist/module/common';
-import MultiFactorResolver from './MultiFactorResolver';
-import type { FirebaseAuthTypes } from './types/namespaced';
+import MultiFactorResolverClass from './MultiFactorResolver';
+import type { MultiFactorError, MultiFactorResolver } from './types/auth';
 import type { AuthInternal } from './types/internal';
 
-type ErrorWithResolver = FirebaseAuthTypes.MultiFactorError & {
+type ErrorWithResolver = MultiFactorError & {
   userInfo?: {
     resolver?: {
-      hints: FirebaseAuthTypes.MultiFactorResolver['hints'];
-      session: FirebaseAuthTypes.MultiFactorResolver['session'];
+      hints: MultiFactorResolver['hints'];
+      session: MultiFactorResolver['session'];
     };
   };
 };
@@ -21,21 +21,19 @@ type ErrorWithResolver = FirebaseAuthTypes.MultiFactorError & {
 export function getMultiFactorResolver(
   auth: AuthInternal,
   error: ErrorWithResolver,
-): FirebaseAuthTypes.MultiFactorResolver | null {
+): MultiFactorResolver | null {
   if (isOther) {
-    return auth.native.getMultiFactorResolver(
-      error,
-    ) as FirebaseAuthTypes.MultiFactorResolver | null;
+    return auth.native.getMultiFactorResolver(error) as MultiFactorResolver | null;
   }
   if (
     error.hasOwnProperty('userInfo') &&
     error.userInfo?.hasOwnProperty('resolver') &&
     error.userInfo.resolver
   ) {
-    return new MultiFactorResolver(
+    return new MultiFactorResolverClass(
       auth,
       error.userInfo.resolver,
-    ) as unknown as FirebaseAuthTypes.MultiFactorResolver;
+    ) as unknown as MultiFactorResolver;
   }
 
   return null;