@react-native-firebase/auth 26.3.3 → 27.0.0

package/ios/RNFBAuth/RNFBAuthHelper.m

@@ -36,7 +36,35 @@
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBApp/RNFBAppModule.h"
 #import "RNFBApp/RNFBSharedUtils.h"
+#import "RNFBAuthCacheRegistry.h"
 #import "RNFBAuthHelper.h"
+#import "RNFBAuthListenerRegistry.h"
+#import "RNFBAuthNullSentinelDecoder.h"
+
+#if __has_include(<RNFBAuth/RNFBAuth-Swift.h>)
+#import <RNFBAuth/RNFBAuth-Swift.h>
+#elif __has_include("RNFBAuth-Swift.h")
+#import "RNFBAuth-Swift.h"
+#elif __has_include("RNFBHandleMapStorage-Swift.inc")
+#import "RNFBHandleMapStorage-Swift.inc"
+#else
+#error "RNFBAuthErrorCodeMapper Swift interface not found"
+#endif
+
+@interface RNFBAuthListenerRemover : NSObject
+@property(nonatomic, copy, nullable) void (^onRemove)(void);
+- (void)remove;
+@end
+
+@implementation RNFBAuthListenerRemover
+- (void)remove {
+  if (self.onRemove != nil) {
+    void (^block)(void) = self.onRemove;
+    self.onRemove = nil;
+    block();
+  }
+}
+@end
 
 static void RNFBAuthThrowSyncErrorWithCode(NSString *code, NSString *message) {
   @throw [NSException exceptionWithName:code
@@ -71,77 +99,15 @@ static NSString *const AUTH_STATE_CHANGED_EVENT = @"auth_state_changed";
 static NSString *const AUTH_ID_TOKEN_CHANGED_EVENT = @"auth_id_token_changed";
 static NSString *const PHONE_AUTH_STATE_CHANGED_EVENT = @"phone_auth_state_changed";
 
-static NSString *const AuthErrorCode_toJSErrorCode[] = {
-    [FIRAuthErrorCodeInvalidCustomToken] = @"invalid-custom-token",
-    [FIRAuthErrorCodeCustomTokenMismatch] = @"custom-token-mismatch",
-    [FIRAuthErrorCodeInvalidCredential] = @"invalid-credential",
-    [FIRAuthErrorCodeUserDisabled] = @"user-disabled",
-    [FIRAuthErrorCodeOperationNotAllowed] = @"operation-not-allowed",
-    [FIRAuthErrorCodeEmailAlreadyInUse] = @"email-already-in-use",
-    [FIRAuthErrorCodeInvalidEmail] = @"invalid-email",
-    [FIRAuthErrorCodeWrongPassword] = @"wrong-password",
-    [FIRAuthErrorCodeTooManyRequests] = @"too-many-requests",
-    [FIRAuthErrorCodeUserNotFound] = @"user-not-found",
-    [FIRAuthErrorCodeAccountExistsWithDifferentCredential] =
-        @"account-exists-with-different-credential",
-    [FIRAuthErrorCodeRequiresRecentLogin] = @"requires-recent-login",
-    [FIRAuthErrorCodeProviderAlreadyLinked] = @"provider-already-linked",
-    [FIRAuthErrorCodeNoSuchProvider] = @"no-such-provider",
-    [FIRAuthErrorCodeInvalidUserToken] = @"invalid-user-token",
-    [FIRAuthErrorCodeNetworkError] = @"network-request-failed",
-    [FIRAuthErrorCodeUserTokenExpired] = @"user-token-expired",
-    [FIRAuthErrorCodeInvalidAPIKey] = @"invalid-api-key",
-    [FIRAuthErrorCodeUserMismatch] = @"user-mismatch",
-    [FIRAuthErrorCodeCredentialAlreadyInUse] = @"credential-already-in-use",
-    [FIRAuthErrorCodeWeakPassword] = @"weak-password",
-    [FIRAuthErrorCodeAppNotAuthorized] = @"app-not-authorized",
-    [FIRAuthErrorCodeExpiredActionCode] = @"expired-action-code",
-    [FIRAuthErrorCodeInvalidActionCode] = @"invalid-action-code",
-    [FIRAuthErrorCodeInvalidMessagePayload] = @"invalid-message-payload",
-    [FIRAuthErrorCodeInvalidSender] = @"invalid-sender",
-    [FIRAuthErrorCodeInvalidRecipientEmail] = @"invalid-recipient-email",
-    [FIRAuthErrorCodeMissingEmail] = @"invalid-email",
-    [FIRAuthErrorCodeMissingIosBundleID] = @"missing-ios-bundle-id",
-    [FIRAuthErrorCodeMissingAndroidPackageName] = @"missing-android-pkg-name",
-    [FIRAuthErrorCodeUnauthorizedDomain] = @"unauthorized-domain",
-    [FIRAuthErrorCodeInvalidContinueURI] = @"invalid-continue-uri",
-    [FIRAuthErrorCodeMissingContinueURI] = @"missing-continue-uri",
-    [FIRAuthErrorCodeMissingPhoneNumber] = @"missing-phone-number",
-    [FIRAuthErrorCodeInvalidPhoneNumber] = @"invalid-phone-number",
-    [FIRAuthErrorCodeMissingVerificationCode] = @"missing-verification-code",
-    [FIRAuthErrorCodeInvalidVerificationCode] = @"invalid-verification-code",
-    [FIRAuthErrorCodeMissingVerificationID] = @"missing-verification-id",
-    [FIRAuthErrorCodeInvalidVerificationID] = @"invalid-verification-id",
-    [FIRAuthErrorCodeMissingAppCredential] = @"missing-app-credential",
-    [FIRAuthErrorCodeInvalidAppCredential] = @"invalid-app-credential",
-    [FIRAuthErrorCodeSessionExpired] = @"code-expired",
-    [FIRAuthErrorCodeQuotaExceeded] = @"quota-exceeded",
-    [FIRAuthErrorCodeMissingAppToken] = @"missing-apns-token",
-    [FIRAuthErrorCodeNotificationNotForwarded] = @"notification-not-forwarded",
-    [FIRAuthErrorCodeAppNotVerified] = @"app-not-verified",
-    [FIRAuthErrorCodeCaptchaCheckFailed] = @"captcha-check-failed",
-    [FIRAuthErrorCodeWebContextAlreadyPresented] = @"cancelled-popup-request",
-    [FIRAuthErrorCodeWebContextCancelled] = @"popup-closed-by-user",
-    [FIRAuthErrorCodeAppVerificationUserInteractionFailure] =
-        @"app-verification-user-interaction-failure",
-    [FIRAuthErrorCodeInvalidClientID] = @"invalid-oauth-client-id",
-    [FIRAuthErrorCodeWebNetworkRequestFailed] = @"network-request-failed",
-    [FIRAuthErrorCodeWebInternalError] = @"internal-error",
-    [FIRAuthErrorCodeNullUser] = @"null-user",
-    [FIRAuthErrorCodeKeychainError] = @"keychain-error",
-    [FIRAuthErrorCodeInternalError] = @"internal-error",
-    [FIRAuthErrorCodeMalformedJWT] = @"malformed-jwt",
-    [FIRAuthErrorCodeSecondFactorRequired] = @"multi-factor-auth-required"};
-
-static __strong NSMutableDictionary *authStateHandlers;
-static __strong NSMutableDictionary *idTokenHandlers;
+static __strong RNFBAuthListenerRegistry *authStateHandlers;
+static __strong RNFBAuthListenerRegistry *idTokenHandlers;
 static __strong NSMutableDictionary *emulatorConfigs;
 // Used for caching credentials between method calls.
-static __strong NSMutableDictionary<NSString *, FIRAuthCredential *> *credentials;
+static __strong RNFBAuthCacheRegistry *credentials;
 #if TARGET_OS_IOS
-static __strong NSMutableDictionary<NSString *, FIRMultiFactorResolver *> *cachedResolver;
-static __strong NSMutableDictionary<NSString *, FIRMultiFactorSession *> *cachedSessions;
-static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecrets;
+static __strong RNFBAuthCacheRegistry *cachedResolver;
+static __strong RNFBAuthCacheRegistry *cachedSessions;
+static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
 #endif
 
 @interface RNFBAuthHelper ()
@@ -200,14 +166,14 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 + (void)initializeSharedStateOnce {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    authStateHandlers = [[NSMutableDictionary alloc] init];
-    idTokenHandlers = [[NSMutableDictionary alloc] init];
+    authStateHandlers = [[RNFBAuthListenerRegistry alloc] init];
+    idTokenHandlers = [[RNFBAuthListenerRegistry alloc] init];
     emulatorConfigs = [[NSMutableDictionary alloc] init];
-    credentials = [[NSMutableDictionary alloc] init];
+    credentials = [[RNFBAuthCacheRegistry alloc] init];
 #if TARGET_OS_IOS
-    cachedResolver = [[NSMutableDictionary alloc] init];
-    cachedSessions = [[NSMutableDictionary alloc] init];
-    cachedTotpSecrets = [[NSMutableDictionary alloc] init];
+    cachedResolver = [[RNFBAuthCacheRegistry alloc] init];
+    cachedSessions = [[RNFBAuthCacheRegistry alloc] init];
+    cachedTotpSecrets = [[RNFBAuthCacheRegistry alloc] init];
 #endif
   });
 }
@@ -215,26 +181,14 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 + (void)invalidate {
   [self initializeSharedStateOnce];
 
-  for (NSString *key in authStateHandlers) {
-    FIRApp *firebaseApp = [RCTConvert firAppFromString:key];
-
-    [[FIRAuth authWithApp:firebaseApp]
-        removeAuthStateDidChangeListener:[authStateHandlers valueForKey:key]];
-  }
-  [authStateHandlers removeAllObjects];
-
-  for (NSString *key in idTokenHandlers) {
-    FIRApp *firebaseApp = [RCTConvert firAppFromString:key];
-    [[FIRAuth authWithApp:firebaseApp]
-        removeIDTokenDidChangeListener:[idTokenHandlers valueForKey:key]];
-  }
-  [idTokenHandlers removeAllObjects];
+  [authStateHandlers removeAll];
+  [idTokenHandlers removeAll];
 
-  [credentials removeAllObjects];
+  [credentials clear];
 #if TARGET_OS_IOS
-  [cachedResolver removeAllObjects];
-  [cachedSessions removeAllObjects];
-  [cachedTotpSecrets removeAllObjects];
+  [cachedResolver clear];
+  [cachedSessions clear];
+  [cachedTotpSecrets clear];
 #endif
 }
 
@@ -245,68 +199,75 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   [self initializeSharedStateOnce];
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
-  if (![authStateHandlers valueForKey:firebaseApp.name]) {
-    FIRAuthStateDidChangeListenerHandle newListenerHandle = [[FIRAuth authWithApp:firebaseApp]
-        addAuthStateDidChangeListener:^(FIRAuth *_Nonnull auth, FIRUser *_Nullable user) {
-          if (user != nil) {
-            [RNFBSharedUtils sendJSEventForApp:firebaseApp
-                                          name:AUTH_STATE_CHANGED_EVENT
-                                          body:@{keyUser : [self firebaseUserToDict:user]}];
-          } else {
-            [RNFBSharedUtils sendJSEventForApp:firebaseApp name:AUTH_STATE_CHANGED_EVENT body:@{}];
-          }
-        }];
-    authStateHandlers[firebaseApp.name] = newListenerHandle;
+  if ([authStateHandlers get:firebaseApp.name] != nil) {
+    return;
   }
+
+  FIRAuth *auth = [FIRAuth authWithApp:firebaseApp];
+  FIRAuthStateDidChangeListenerHandle newListenerHandle = [auth
+      addAuthStateDidChangeListener:^(FIRAuth *_Nonnull authInstance, FIRUser *_Nullable user) {
+        if (user != nil) {
+          [RNFBSharedUtils sendJSEventForApp:firebaseApp
+                                        name:AUTH_STATE_CHANGED_EVENT
+                                        body:@{keyUser : [self firebaseUserToDict:user]}];
+        } else {
+          [RNFBSharedUtils sendJSEventForApp:firebaseApp name:AUTH_STATE_CHANGED_EVENT body:@{}];
+        }
+      }];
+
+  RNFBAuthListenerRemover *remover = [[RNFBAuthListenerRemover alloc] init];
+  remover.onRemove = ^{
+    [auth removeAuthStateDidChangeListener:newListenerHandle];
+  };
+  [authStateHandlers putOrDiscard:firebaseApp.name value:remover];
 }
 
 + (void)removeAuthStateListener:(NSString *)appName {
   [self initializeSharedStateOnce];
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
-
-  if ([authStateHandlers valueForKey:firebaseApp.name]) {
-    [[FIRAuth authWithApp:firebaseApp]
-        removeAuthStateDidChangeListener:[authStateHandlers valueForKey:firebaseApp.name]];
-    [authStateHandlers removeObjectForKey:firebaseApp.name];
-  }
+  [authStateHandlers takeAndRemove:firebaseApp.name];
 }
 
 + (void)addIdTokenListener:(NSString *)appName {
   [self initializeSharedStateOnce];
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
-  if (![idTokenHandlers valueForKey:firebaseApp.name]) {
-    FIRIDTokenDidChangeListenerHandle newListenerHandle = [[FIRAuth authWithApp:firebaseApp]
-        addIDTokenDidChangeListener:^(FIRAuth *_Nonnull auth, FIRUser *_Nullable user) {
-          if (user != nil) {
-            [RNFBSharedUtils sendJSEventForApp:firebaseApp
-                                          name:AUTH_ID_TOKEN_CHANGED_EVENT
-                                          body:@{keyUser : [self firebaseUserToDict:user]}];
-          } else {
-            [RNFBSharedUtils sendJSEventForApp:firebaseApp
-                                          name:AUTH_ID_TOKEN_CHANGED_EVENT
-                                          body:@{}];
-          }
-        }];
-    idTokenHandlers[firebaseApp.name] = newListenerHandle;
+  if ([idTokenHandlers get:firebaseApp.name] != nil) {
+    return;
   }
+
+  FIRAuth *auth = [FIRAuth authWithApp:firebaseApp];
+  FIRIDTokenDidChangeListenerHandle newListenerHandle =
+      [auth addIDTokenDidChangeListener:^(FIRAuth *_Nonnull authInstance, FIRUser *_Nullable user) {
+        if (user != nil) {
+          [RNFBSharedUtils sendJSEventForApp:firebaseApp
+                                        name:AUTH_ID_TOKEN_CHANGED_EVENT
+                                        body:@{keyUser : [self firebaseUserToDict:user]}];
+        } else {
+          [RNFBSharedUtils sendJSEventForApp:firebaseApp name:AUTH_ID_TOKEN_CHANGED_EVENT body:@{}];
+        }
+      }];
+
+  RNFBAuthListenerRemover *remover = [[RNFBAuthListenerRemover alloc] init];
+  remover.onRemove = ^{
+    [auth removeIDTokenDidChangeListener:newListenerHandle];
+  };
+  [idTokenHandlers putOrDiscard:firebaseApp.name value:remover];
 }
 
 + (void)removeIdTokenListener:(NSString *)appName {
   [self initializeSharedStateOnce];
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
-
-  if ([idTokenHandlers valueForKey:firebaseApp.name]) {
-    [[FIRAuth authWithApp:firebaseApp]
-        removeIDTokenDidChangeListener:[idTokenHandlers valueForKey:firebaseApp.name]];
-    [idTokenHandlers removeObjectForKey:firebaseApp.name];
-  }
+  [idTokenHandlers takeAndRemove:firebaseApp.name];
 }
 
 + (void)configureAuthDomain:(NSString *)appName {
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
-  NSString *authDomain = [RNFBAppModule getCustomDomain:firebaseApp.name];
+  // customAuthDomains is keyed by the JS app name ([DEFAULT]); FIRApp.name for the default app
+  // is __FIRAPP_DEFAULT. Look up with the existing JS-name converter (no parallel key helper).
+  NSString *authDomain =
+      [RNFBAppModule getCustomDomain:[RNFBSharedUtils getAppJavaScriptName:firebaseApp.name]];
   DLog(@"RNFBAuth app: %@ customAuthDomain: %@", firebaseApp.name, authDomain);
   if (authDomain != nil) {
     [FIRAuth authWithApp:firebaseApp].customAuthDomain = authDomain;
@@ -640,15 +601,18 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   if (user) {
     FIRUserProfileChangeRequest *changeRequest = [user profileChangeRequest];
-    NSMutableArray *allKeys = [[props allKeys] mutableCopy];
+    // The decoder omits NSNull keys (subscript → nil). Iterate the original props keys so a
+    // cleared displayName/photoURL still reaches setValue:forKey: with nil.
+    NSDictionary *decodedProps = [RNFBAuthNullSentinelDecoder decodedProfileProps:props];
 
-    for (NSString *key in allKeys) {
+    for (NSString *key in props) {
       @try {
+        id value = decodedProps[key];
         if ([key isEqualToString:keyPhotoUrl]) {
-          NSURL *url = [NSURL URLWithString:[props valueForKey:key]];
-          [changeRequest setValue:url forKey:key];
+          [changeRequest setValue:[RNFBAuthNullSentinelDecoder photoURLFromDecodedValue:value]
+                           forKey:key];
         } else {
-          [changeRequest setValue:props[key] forKey:key];
+          [changeRequest setValue:value forKey:key];
         }
       } @catch (NSException *exception) {
         DLog(@"Exception occurred while configuring: %@", exception);
@@ -1054,7 +1018,8 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   [self initializeSharedStateOnce];
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
-  if ([cachedResolver valueForKey:sessionKey] == nil) {
+  FIRMultiFactorResolver *resolver = [cachedResolver get:sessionKey];
+  if (resolver == nil) {
     [RNFBSharedUtils
         rejectPromiseWithUserInfo:reject
                          userInfo:(NSMutableDictionary *)@{
@@ -1063,10 +1028,10 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
                          }];
     return;
   }
-  FIRMultiFactorSession *session = cachedResolver[sessionKey].session;
+  FIRMultiFactorSession *session = resolver.session;
   NSPredicate *findByUid = [NSPredicate predicateWithFormat:@"UID == %@", hintUid];
   FIRMultiFactorInfo *_Nullable hint =
-      [[cachedResolver[sessionKey].hints filteredArrayUsingPredicate:findByUid] firstObject];
+      [[resolver.hints filteredArrayUsingPredicate:findByUid] firstObject];
   if (hint == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
                                       userInfo:(NSMutableDictionary *)@{
@@ -1087,8 +1052,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
                                   if (error) {
                                     [self promiseRejectAuthException:reject error:error];
                                   } else {
-                                    DLog(@"verificationID: %@", verificationID)
-                                        resolve(verificationID);
+                                    resolve(verificationID);
                                   }
                                 }];
 }
@@ -1102,9 +1066,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
   DLog(@"verifyPhoneNumberForMultifactor using app: %@", firebaseApp.name);
-  DLog(@"verifyPhoneNumberForMultifactor phoneNumber: %@", phoneNumber);
-  DLog(@"verifyPhoneNumberForMultifactor sessionKey: %@", sessionKey);
-  FIRMultiFactorSession *session = cachedSessions[sessionKey];
+  FIRMultiFactorSession *session = [cachedSessions get:sessionKey];
   if (session == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
                                       userInfo:(NSMutableDictionary *)@{
@@ -1142,23 +1104,22 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
       [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
           credentialWithVerificationID:verificationId
                       verificationCode:verificationCode];
-  DLog(@"credential: %@", credential);
-
   FIRMultiFactorAssertion *assertion =
       [FIRPhoneMultiFactorGenerator assertionWithCredential:credential];
 
-  [cachedResolver[session] resolveSignInWithAssertion:assertion
-                                           completion:^(FIRAuthDataResult *_Nullable authResult,
-                                                        NSError *_Nullable error) {
-                                             DLog(@"authError: %@", error) if (error) {
-                                               [self promiseRejectAuthException:reject error:error];
-                                             }
-                                             else {
-                                               [self promiseWithAuthResult:resolve
-                                                                  rejecter:reject
-                                                                authResult:authResult];
-                                             }
-                                           }];
+  FIRMultiFactorResolver *signInResolver = [cachedResolver get:session];
+  [signInResolver resolveSignInWithAssertion:assertion
+                                  completion:^(FIRAuthDataResult *_Nullable authResult,
+                                               NSError *_Nullable error) {
+                                    DLog(@"authError: %@", error) if (error) {
+                                      [self promiseRejectAuthException:reject error:error];
+                                    }
+                                    else {
+                                      [self promiseWithAuthResult:resolve
+                                                         rejecter:reject
+                                                       authResult:authResult];
+                                    }
+                                  }];
 }
 
 + (void)resolveTotpSignIn:(NSString *)appName
@@ -1175,19 +1136,19 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   FIRMultiFactorAssertion *assertion =
       [FIRTOTPMultiFactorGenerator assertionForSignInWithEnrollmentID:uid
                                                       oneTimePassword:oneTimePassword];
-  [cachedResolver[sessionKey] resolveSignInWithAssertion:assertion
-                                              completion:^(FIRAuthDataResult *_Nullable authResult,
-                                                           NSError *_Nullable error) {
-                                                DLog(@"authError: %@", error) if (error) {
-                                                  [self promiseRejectAuthException:reject
-                                                                             error:error];
-                                                }
-                                                else {
-                                                  [self promiseWithAuthResult:resolve
-                                                                     rejecter:reject
-                                                                   authResult:authResult];
-                                                }
-                                              }];
+  FIRMultiFactorResolver *totpSignInResolver = [cachedResolver get:sessionKey];
+  [totpSignInResolver resolveSignInWithAssertion:assertion
+                                      completion:^(FIRAuthDataResult *_Nullable authResult,
+                                                   NSError *_Nullable error) {
+                                        DLog(@"authError: %@", error) if (error) {
+                                          [self promiseRejectAuthException:reject error:error];
+                                        }
+                                        else {
+                                          [self promiseWithAuthResult:resolve
+                                                             rejecter:reject
+                                                           authResult:authResult];
+                                        }
+                                      }];
 }
 
 + (void)generateTotpSecret:(NSString *)appName
@@ -1199,9 +1160,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   DLog(@"using instance resolve generateTotpSecret: %@", firebaseApp.name);
 
-  FIRMultiFactorSession *session = cachedSessions[sessionKey];
-  DLog(@"using sessionKey: %@", sessionKey);
-  DLog(@"using session: %@", session);
+  FIRMultiFactorSession *session = [cachedSessions get:sessionKey];
   [FIRTOTPMultiFactorGenerator
       generateSecretWithMultiFactorSession:session
                                 completion:^(FIRTOTPSecret *_Nullable totpSecret,
@@ -1211,9 +1170,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
                                   }
                                   else {
                                     NSString *secretKey = totpSecret.sharedSecretKey;
-                                    DLog(@"secretKey generated: %@", secretKey);
-                                    cachedTotpSecrets[secretKey] = totpSecret;
-                                    DLog(@"cachedSecret: %@", cachedTotpSecrets[secretKey]);
+                                    [cachedTotpSecrets putReplacing:secretKey value:totpSecret];
                                     resolve(@{
                                       @"secretKey" : secretKey,
                                     });
@@ -1229,14 +1186,12 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
   DLog(@"generateQrCodeUrl using instance resolve generateQrCodeUrl: %@", firebaseApp.name);
-  DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
-  FIRTOTPSecret *totpSecret = cachedTotpSecrets[secretKey];
+  FIRTOTPSecret *totpSecret = [cachedTotpSecrets get:secretKey];
   if (!totpSecret) {
     RNFBAuthThrowSyncErrorWithCode(@"invalid-multi-factor-secret",
                                    @"can't find secret for provided key");
   }
   NSString *url = [totpSecret generateQRCodeURLWithAccountName:account issuer:issuer];
-  DLog(@"generateQrCodeUrl got QR Code URL %@", url);
   return url;
 }
 
@@ -1245,9 +1200,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
            qrCodeUri:(NSString *)qrCodeUri {
   [self initializeSharedStateOnce];
 
-  DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
-  FIRTOTPSecret *totpSecret = cachedTotpSecrets[secretKey];
-  DLog(@"openInOtpApp using qrCodeUri: %@", qrCodeUri);
+  FIRTOTPSecret *totpSecret = [cachedTotpSecrets get:secretKey];
   [totpSecret openInOTPAppWithQRCodeURL:qrCodeUri];
 }
 
@@ -1266,7 +1219,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
     }
 
     NSString *sessionId = [NSString stringWithFormat:@"%@", @([session hash])];
-    cachedSessions[sessionId] = session;
+    [cachedSessions putReplacing:sessionId value:session];
     resolve(sessionId);
   }];
 }
@@ -1333,9 +1286,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   DLog(@"using instance finalizeTotpEnrollment: %@", firebaseApp.name);
 
-  FIRTOTPSecret *cachedTotpSecret = cachedTotpSecrets[totpSecret];
-  DLog(@"using totpSecretKey: %@", totpSecret);
-  DLog(@"using cachedSecret: %@", cachedTotpSecret);
+  FIRTOTPSecret *cachedTotpSecret = [cachedTotpSecrets get:totpSecret];
   FIRTOTPMultiFactorAssertion *assertion =
       [FIRTOTPMultiFactorGenerator assertionForEnrollmentWithSecret:cachedTotpSecret
                                                     oneTimePassword:verificationCode];
@@ -1789,8 +1740,9 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   FIRAuthCredential *credential;
 
   // First check if we cached an authToken
-  if (credentials[authToken] != nil && ![credentials[authToken] isEqual:[NSNull null]]) {
-    credential = credentials[authToken];
+  FIRAuthCredential *cachedCredential = [credentials get:authToken];
+  if (cachedCredential != nil) {
+    credential = cachedCredential;
   } else if ([provider compare:@"twitter.com" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
     credential = [FIRTwitterAuthProvider credentialWithToken:authToken secret:authTokenSecret];
   } else if ([provider compare:@"facebook.com" options:NSCaseInsensitiveSearch] == NSOrderedSame &&
@@ -1895,82 +1847,15 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
 + (NSDictionary *)getJSError:(NSError *)error {
   [self initializeSharedStateOnce];
-  NSString *code = AuthErrorCode_toJSErrorCode[error.code];
+  NSString *code = [RNFBAuthErrorCodeMapper jsErrorCodeForAuthErrorCode:error.code];
   NSString *message = [error localizedDescription];
   NSString *nativeErrorMessage = [error localizedDescription];
 
   if (code == nil) code = @"unknown";
 
-  // TODO(Salakar): replace these with a AuthErrorCode_toJSErrorMessage map (like codes now does)
-  switch (error.code) {
-    case FIRAuthErrorCodeInvalidCustomToken:
-      message = @"The custom token format is incorrect. Please check the documentation.";
-      break;
-    case FIRAuthErrorCodeCustomTokenMismatch:
-      message = @"The custom token corresponds to a different audience.";
-      break;
-    case FIRAuthErrorCodeInvalidCredential:
-      message = @"The supplied auth credential is malformed or has expired.";
-      break;
-    case FIRAuthErrorCodeInvalidEmail:
-      message = @"The email address is badly formatted.";
-      break;
-    case FIRAuthErrorCodeWrongPassword:
-      message = @"The password is invalid or the user does not have a password.";
-      break;
-    case FIRAuthErrorCodeUserMismatch:
-      message = @"The supplied credentials do not correspond to the previously signed in user.";
-      break;
-    case FIRAuthErrorCodeRequiresRecentLogin:
-      message = @"This operation is sensitive and requires recent authentication. Log in again "
-                @"before retrying this request.";
-      break;
-    case FIRAuthErrorCodeSecondFactorRequired:
-      message = @"Please complete a second factor challenge to finish signing into this account.";
-      break;
-    case FIRAuthErrorCodeAccountExistsWithDifferentCredential:
-      message = @"An account already exists with the same email address but different sign-in "
-                @"credentials. Sign in using a provider associated with this email address.";
-      break;
-    case FIRAuthErrorCodeEmailAlreadyInUse:
-      message = @"The email address is already in use by another account.";
-      break;
-    case FIRAuthErrorCodeCredentialAlreadyInUse:
-      message = @"This credential is already associated with a different user account.";
-      break;
-    case FIRAuthErrorCodeUserDisabled:
-      message = @"The user account has been disabled by an administrator.";
-      break;
-    case FIRAuthErrorCodeUserTokenExpired:
-      message = @"The user's credential is no longer valid. The user must sign in again.";
-      break;
-    case FIRAuthErrorCodeUserNotFound:
-      message = @"There is no user record corresponding to this identifier. The user may have been "
-                @"deleted.";
-      break;
-    case FIRAuthErrorCodeInvalidUserToken:
-      message = @"The user's credential is no longer valid. The user must sign in again.";
-      break;
-    case FIRAuthErrorCodeWeakPassword:
-      message = @"The given password is invalid.";
-      break;
-    case FIRAuthErrorCodeOperationNotAllowed:
-      message = @"This operation is not allowed. You must enable this service in the console.";
-      break;
-    case FIRAuthErrorCodeNetworkError:
-      message = @"A network error has occurred, please try again.";
-      break;
-    case FIRAuthErrorCodeInternalError:
-      message = @"An internal error has occurred, please try again.";
-      break;
-    case FIRAuthErrorCodeInvalidPhoneNumber:
-      message = @"The format of the phone number provided is incorrect. "
-                @"Please enter the phone number in a format that can be parsed into E.164 format. "
-                @"E.164 phone numbers are written in the format [+][country code][subscriber "
-                @"number including area code].";
-      break;
-    default:
-      break;
+  NSString *overrideMessage = [RNFBAuthErrorCodeMapper jsErrorMessageForAuthErrorCode:error.code];
+  if (overrideMessage != nil) {
+    message = overrideMessage;
   }
 
   NSDictionary *authCredentialDict = nil;
@@ -1986,7 +1871,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
     resolverDict = [self multiFactorResolverToDict:resolver];
 
     NSString *sessionKey = [NSString stringWithFormat:@"%@", @([resolver.session hash])];
-    cachedResolver[sessionKey] = resolver;
+    [cachedResolver putReplacing:sessionKey value:resolver];
   }
 #endif
 
@@ -2175,7 +2060,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   NSString *authCredentialHash = [NSString stringWithFormat:@"%@", @([authCredential hash])];
 
   // Temporarily store the non-serializable credential for later
-  credentials[authCredentialHash] = authCredential;
+  [credentials putReplacing:authCredentialHash value:authCredential];
 
   return @{
     keyProviderId : authCredential.provider,

package/ios/RNFBAuth/RNFBAuthListenerRegistry.h

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Auth-state / id-token listener map. Unique `put` / `putOrDiscard`; callers `take` or `removeAll`
+ * then `remove` outside the HandleMap lock. Skip-if-registered is `get != nil`. Stored values are
+ * expected to respond to `remove`.
+ */
+@interface RNFBAuthListenerRegistry : NSObject
+
+- (BOOL)put:(id)key value:(id)value error:(NSError *_Nullable *_Nullable)error;
+/// Unique put. On collision, `remove`s the incoming value and leaves the existing mapping.
+- (BOOL)putOrDiscard:(id)key value:(id)value;
+- (nullable id)get:(id)key;
+- (nullable id)take:(id)key;
+- (void)takeAndRemove:(id)key;
+- (void)removeAll;
+
+@end
+
+NS_ASSUME_NONNULL_END