@react-native-firebase/auth 19.2.2 → 19.3.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [19.3.0](https://github.com/invertase/react-native-firebase/compare/v19.2.2...v19.3.0) (2024-05-20)
+
+### Features
+
+- include phoneNumber from PhoneMultiFactorInfo ([5acdfb3](https://github.com/invertase/react-native-firebase/commit/5acdfb306279560a9fdd31a35c80f3edca4d0d59))
+
+### Bug Fixes
+
+- **auth, android:** change error code for invalid multi-factor session to match iOS WIP needs test ([0f15f2d](https://github.com/invertase/react-native-firebase/commit/0f15f2d36cfec807c42b91b53289fa699ffe4f66))
+- **auth, android:** return credential for signin if phone auth has link collision ([#7793](https://github.com/invertase/react-native-firebase/issues/7793)) ([f8916e2](https://github.com/invertase/react-native-firebase/commit/f8916e25371d43db2bd8c22c7f35e8064edc6806))
+- **auth, ios:** reject multi-factor API call if session not found ([3d61e32](https://github.com/invertase/react-native-firebase/commit/3d61e32394d83fae5d136d21ecbea71590a2adb7))
+
 ## [19.2.2](https://github.com/invertase/react-native-firebase/compare/v19.2.1...v19.2.2) (2024-04-13)
 
 **Note:** Version bump only for package @react-native-firebase/auth

package/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java

@@ -49,6 +49,7 @@ import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseAuthMultiFactorException;
 import com.google.firebase.auth.FirebaseAuthProvider;
 import com.google.firebase.auth.FirebaseAuthSettings;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.FirebaseUserMetadata;
 import com.google.firebase.auth.GetTokenResult;
@@ -107,6 +108,10 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
   private final HashMap<String, MultiFactorResolver> mCachedResolvers = new HashMap<>();
   private final HashMap<String, MultiFactorSession> mMultiFactorSessions = new HashMap<>();
 
+  // storage for anonymous phone auth credentials, used for linkWithCredentials
+  // https://github.com/invertase/react-native-firebase/issues/4911
+  private HashMap<String, AuthCredential> credentials = new HashMap<>();
+
   ReactNativeFirebaseAuthModule(ReactApplicationContext reactContext) {
     super(reactContext, TAG);
   }
@@ -914,9 +919,8 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
       return;
     }
 
-    OAuthProvider.Builder builder = OAuthProvider.newBuilder(
-        provider.getString("providerId"),
-        firebaseAuth);
+    OAuthProvider.Builder builder =
+        OAuthProvider.newBuilder(provider.getString("providerId"), firebaseAuth);
     // Add scopes if present
     if (provider.hasKey("scopes")) {
       ReadableArray scopes = provider.getArray("scopes");
@@ -1184,7 +1188,7 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
       final Promise promise) {
     final MultiFactorSession multiFactorSession = mMultiFactorSessions.get(sessionKey);
     if (multiFactorSession == null) {
-      rejectPromiseWithCodeAndMessage(promise, "unknown", "can't find session for provided key");
+      rejectPromiseWithCodeAndMessage(promise, "invalid-multi-factor-session", "can't find session for provided key");
       return;
     }
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
@@ -1613,6 +1617,17 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
                     promiseWithAuthResult(task.getResult(), promise);
                   } else {
                     Exception exception = task.getException();
+                    if (exception instanceof FirebaseAuthUserCollisionException collEx) {
+                      AuthCredential updatedCredential = collEx.getUpdatedCredential();
+                      Log.d(TAG, "link:onComplete:collisionFailure", collEx);
+                      // If we have a credential in the error, we can return it, otherwise fall
+                      // through
+                      if (updatedCredential != null) {
+                        Log.d(TAG, "link:onComplete:collisionFailure had credential", collEx);
+                        promiseRejectLinkAuthException(promise, collEx, updatedCredential);
+                        return;
+                      }
+                    }
                     Log.e(TAG, "link:onComplete:failure", exception);
                     promiseRejectAuthException(promise, exception);
                   }
@@ -1650,9 +1665,8 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
       return;
     }
 
-    OAuthProvider.Builder builder = OAuthProvider.newBuilder(
-        provider.getString("providerId"),
-        firebaseAuth);
+    OAuthProvider.Builder builder =
+        OAuthProvider.newBuilder(provider.getString("providerId"), firebaseAuth);
     // Add scopes if present
     if (provider.hasKey("scopes")) {
       ReadableArray scopes = provider.getArray("scopes");
@@ -1795,9 +1809,8 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
       return;
     }
 
-    OAuthProvider.Builder builder = OAuthProvider.newBuilder(
-        provider.getString("providerId"),
-        firebaseAuth);
+    OAuthProvider.Builder builder =
+        OAuthProvider.newBuilder(provider.getString("providerId"), firebaseAuth);
     // Add scopes if present
     if (provider.hasKey("scopes")) {
       ReadableArray scopes = provider.getArray("scopes");
@@ -1855,6 +1868,9 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
     if (provider.startsWith("oidc.")) {
       return OAuthProvider.newCredentialBuilder(provider).setIdToken(authToken).build();
     }
+    if (credentials.containsKey(authToken) && credentials.get(authToken) != null) {
+      return credentials.get(authToken);
+    }
 
     switch (provider) {
       case "facebook.com":
@@ -2217,6 +2233,36 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
         promise, error.getString("code"), error.getString("message"), resolverAsMap);
   }
 
+  /**
+   * promiseRejectLinkAuthException
+   *
+   * @param promise
+   * @param exception
+   * @param authCredential
+   */
+  private void promiseRejectLinkAuthException(
+      @NonNull Promise promise,
+      @NonNull Exception exception,
+      @NonNull AuthCredential authCredential) {
+    WritableMap error = getJSError(exception);
+    String authHashCode = String.valueOf(authCredential.hashCode());
+
+    WritableMap authCredentialsMap = Arguments.createMap();
+    authCredentialsMap.putString("providerId", authCredential.getProvider());
+    authCredentialsMap.putString("token", authHashCode);
+    authCredentialsMap.putString("secret", null);
+
+    // Temporarily store the non-serializable credential for later
+    credentials.put(authHashCode, authCredential);
+
+    WritableMap userInfoMap = Arguments.createMap();
+    userInfoMap.putString("code", error.getString("code"));
+    userInfoMap.putString("message", error.getString("message"));
+    userInfoMap.putMap("authCredential", authCredentialsMap);
+
+    promise.reject(error.getString("code"), error.getString("message"), userInfoMap);
+  }
+
   /**
    * getJSError
    *
@@ -2507,6 +2553,10 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
     hintMap.putString("factorId", hint.getFactorId());
     hintMap.putString("uid", hint.getUid());
 
+    if (hint.getFactorId().equals(PhoneMultiFactorGenerator.FACTOR_ID)) {
+      hintMap.putString("phoneNumber", ((PhoneMultiFactorInfo) hint).getPhoneNumber());
+    }
+
     return hintMap;
   }
 

package/ios/RNFBAuth/RNFBAuthModule.m

@@ -578,7 +578,9 @@ RCT_EXPORT_METHOD(signInWithCredential
                                                      @"has expired or is not currently supported.",
                                       }];
   }
-  DLog(@"using app SignInWithCredential: %@", firebaseApp.name)[[FIRAuth authWithApp:firebaseApp]
+  DLog(@"using app SignInWithCredential: %@", firebaseApp.name);
+
+  [[FIRAuth authWithApp:firebaseApp]
       signInWithCredential:credential
                 completion:^(FIRAuthDataResult *authResult, NSError *error) {
                   if (error) {
@@ -820,8 +822,9 @@ RCT_EXPORT_METHOD(signInWithPhoneNumber
                   : (NSString *)phoneNumber
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
-  DLog(@"SignInWthPhoneNumber instance: %@",
-       firebaseApp.name)[[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+  DLog(@"SignInWthPhoneNumber instance: %@", firebaseApp.name);
+
+  [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
       verifyPhoneNumber:phoneNumber
              UIDelegate:nil
              completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {
@@ -862,8 +865,9 @@ RCT_EXPORT_METHOD(verifyPhoneNumberWithMultiFactorInfo
                                       }];
     return;
   }
-  DLog(@"using instance verifyPhoneNumberWithMultiFactorInfo: %@",
-       firebaseApp.name)[[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+  DLog(@"using instance verifyPhoneNumberWithMultiFactorInfo: %@", firebaseApp.name);
+
+  [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
       verifyPhoneNumberWithMultiFactorInfo:hint
                                 UIDelegate:nil
                         multiFactorSession:session
@@ -884,9 +888,19 @@ RCT_EXPORT_METHOD(verifyPhoneNumberForMultiFactor
                   : (NSString *)sessionId
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
+  DLog(@"verifyPhoneNumberForMultifactor using app: %@", firebaseApp.name);
+  DLog(@"verifyPhoneNumberForMultifactor phoneNumber: %@", phoneNumber);
+  DLog(@"verifyPhoneNumberForMultifactor sessionId: %@", sessionId);
   FIRMultiFactorSession *session = cachedSessions[sessionId];
-  DLog(@"using instance VerifyPhoneNumberForMultifactor: %@",
-       firebaseApp.name)[[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+  if (session == nil) {
+    [RNFBSharedUtils rejectPromiseWithUserInfo:reject
+                                      userInfo:(NSMutableDictionary *)@{
+                                        @"code" : @"invalid-multi-factor-session",
+                                        @"message" : @"can't find session for provided key"
+                                      }];
+    return;
+  }
+  [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
        verifyPhoneNumber:phoneNumber
               UIDelegate:nil
       multiFactorSession:session
@@ -907,12 +921,15 @@ RCT_EXPORT_METHOD(resolveMultiFactorSignIn
                   : (NSString *)verificationCode
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
-  DLog(@"using instance resolve MultiFactorSignIn: %@", firebaseApp.name)
-      FIRPhoneAuthCredential *credential =
-          [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
-              credentialWithVerificationID:verificationId
-                          verificationCode:verificationCode];
-  DLog(@"credential: %@", credential) FIRMultiFactorAssertion *assertion =
+  DLog(@"using instance resolve MultiFactorSignIn: %@", firebaseApp.name);
+
+  FIRPhoneAuthCredential *credential =
+      [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+          credentialWithVerificationID:verificationId
+                      verificationCode:verificationCode];
+  DLog(@"credential: %@", credential);
+
+  FIRMultiFactorAssertion *assertion =
       [FIRPhoneMultiFactorGenerator assertionWithCredential:credential];
 
   [cachedResolver[sessionKey] resolveSignInWithAssertion:assertion
@@ -955,11 +972,12 @@ RCT_EXPORT_METHOD(finalizeMultiFactorEnrollment
                   : (NSString *_Nullable)displayName
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
-  DLog(@"using instance finalizeMultifactorEnrollment: %@", firebaseApp.name)
-      FIRPhoneAuthCredential *credential =
-          [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
-              credentialWithVerificationID:verificationId
-                          verificationCode:verificationCode];
+  DLog(@"using instance finalizeMultifactorEnrollment: %@", firebaseApp.name);
+
+  FIRPhoneAuthCredential *credential =
+      [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+          credentialWithVerificationID:verificationId
+                      verificationCode:verificationCode];
   FIRMultiFactorAssertion *assertion =
       [FIRPhoneMultiFactorGenerator assertionWithCredential:credential];
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
@@ -980,8 +998,9 @@ RCT_EXPORT_METHOD(verifyPhoneNumber
                   : (FIRApp *)firebaseApp
                   : (NSString *)phoneNumber
                   : (NSString *)requestKey) {
-  DLog(@"using instance verifyPhoneNumber: %@",
-       firebaseApp.name)[[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
+  DLog(@"using instance verifyPhoneNumber: %@", firebaseApp.name);
+
+  [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
       verifyPhoneNumber:phoneNumber
              UIDelegate:nil
              completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {
@@ -1695,6 +1714,8 @@ RCT_EXPORT_METHOD(useEmulator
       @"enrollmentTime" : enrollmentTime,
       // @deprecated enrollmentDate kept for backwards compatibility, please use enrollmentTime
       @"enrollmentDate" : enrollmentTime,
+      // phoneNumber only present on FIRPhoneMultiFactorInfo
+      @"phoneNumber" : hint.phoneNumber == nil ? [NSNull null] : hint.phoneNumber,
     }];
   }
   return enrolledFactors;

package/lib/index.d.ts

@@ -472,7 +472,21 @@ export namespace FirebaseAuthTypes {
   /**
    * Contains information about a second factor.
    */
-  export interface MultiFactorInfo {
+  export type MultiFactorInfo = PhoneMultiFactorInfo | TotpMultiFactorInfo;
+
+  export interface PhoneMultiFactorInfo extends MultiFactorInfoCommon {
+    factorId: 'phone';
+    /**
+     * The phone number used for this factor.
+     */
+    phoneNumber: string;
+  }
+
+  export interface TotpMultiFactorInfo extends MultiFactorInfoCommon {
+    factorId: 'totp';
+  }
+
+  export interface MultiFactorInfoCommon {
     /**
      * User friendly name for this factor.
      */
@@ -481,10 +495,6 @@ export namespace FirebaseAuthTypes {
      * Time the second factor was enrolled, in UTC.
      */
     enrollmentTime: string;
-    /**
-     * Type of factor.
-     */
-    factorId: FactorId;
     /**
      * Unique id for this factor.
      */

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '19.2.2';
+module.exports = '19.3.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/auth",
-  "version": "19.2.2",
+  "version": "19.3.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The authentication module provides an easy-to-use API to integrate an authentication workflow into new and existing applications. React Native Firebase provides access to all Firebase authentication methods and identity providers.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "plist": "^3.1.0"
   },
   "peerDependencies": {
-    "@react-native-firebase/app": "19.2.2",
+    "@react-native-firebase/app": "19.3.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2c1f48eacba95904c89073dcb391d89d0f966165"
+  "gitHead": "edac62269c1b3088cadf74586d48f68214d6e8e4"
 }