@react-native-firebase/auth 26.3.3 → 26.4.0

package/ios/RNFBAuth/RNFBAuthHelper.m

@@ -36,7 +36,24 @@
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBApp/RNFBAppModule.h"
 #import "RNFBApp/RNFBSharedUtils.h"
+#import "RNFBAuthCacheRegistry.h"
 #import "RNFBAuthHelper.h"
+#import "RNFBAuthListenerRegistry.h"
+
+@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
@@ -133,15 +150,15 @@ static NSString *const AuthErrorCode_toJSErrorCode[] = {
     [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 +217,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 +232,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 +250,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;
@@ -1054,7 +1066,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 +1076,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 *)@{
@@ -1104,7 +1117,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   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 *)@{
@@ -1147,18 +1160,19 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   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 +1189,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,7 +1213,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   DLog(@"using instance resolve generateTotpSecret: %@", firebaseApp.name);
 
-  FIRMultiFactorSession *session = cachedSessions[sessionKey];
+  FIRMultiFactorSession *session = [cachedSessions get:sessionKey];
   DLog(@"using sessionKey: %@", sessionKey);
   DLog(@"using session: %@", session);
   [FIRTOTPMultiFactorGenerator
@@ -1212,8 +1226,8 @@ 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];
+                                    DLog(@"cachedSecret: %@", [cachedTotpSecrets get:secretKey]);
                                     resolve(@{
                                       @"secretKey" : secretKey,
                                     });
@@ -1230,7 +1244,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   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");
@@ -1246,7 +1260,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
   [self initializeSharedStateOnce];
 
   DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
-  FIRTOTPSecret *totpSecret = cachedTotpSecrets[secretKey];
+  FIRTOTPSecret *totpSecret = [cachedTotpSecrets get:secretKey];
   DLog(@"openInOtpApp using qrCodeUri: %@", qrCodeUri);
   [totpSecret openInOTPAppWithQRCodeURL:qrCodeUri];
 }
@@ -1266,7 +1280,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
     }
 
     NSString *sessionId = [NSString stringWithFormat:@"%@", @([session hash])];
-    cachedSessions[sessionId] = session;
+    [cachedSessions putReplacing:sessionId value:session];
     resolve(sessionId);
   }];
 }
@@ -1333,7 +1347,7 @@ static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecr
 
   DLog(@"using instance finalizeTotpEnrollment: %@", firebaseApp.name);
 
-  FIRTOTPSecret *cachedTotpSecret = cachedTotpSecrets[totpSecret];
+  FIRTOTPSecret *cachedTotpSecret = [cachedTotpSecrets get:totpSecret];
   DLog(@"using totpSecretKey: %@", totpSecret);
   DLog(@"using cachedSecret: %@", cachedTotpSecret);
   FIRTOTPMultiFactorAssertion *assertion =
@@ -1789,8 +1803,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 &&
@@ -1986,7 +2001,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 +2190,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

package/ios/RNFBAuth/RNFBAuthListenerRegistry.m

@@ -0,0 +1,83 @@
+/**
+ * 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 "RNFBAuthListenerRegistry.h"
+
+#if __has_include("RNFBHandleMap.h")
+#import "RNFBHandleMap.h"
+#else
+#import "RNFBApp/RNFBHandleMap.h"
+#endif
+
+@protocol RNFBAuthRemovable <NSObject>
+- (void)remove;
+@end
+
+@interface RNFBAuthListenerRegistry ()
+@property(nonatomic, strong) RNFBHandleMap *map;
+@end
+
+@implementation RNFBAuthListenerRegistry
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    _map = [[RNFBHandleMap alloc] init];
+  }
+  return self;
+}
+
+- (void)rnfb_removeHandle:(id)handle {
+  if (handle && [handle respondsToSelector:@selector(remove)]) {
+    [(id<RNFBAuthRemovable>)handle remove];
+  }
+}
+
+- (BOOL)put:(id)key value:(id)value error:(NSError **)error {
+  return [self.map put:key value:value error:error];
+}
+
+- (BOOL)putOrDiscard:(id)key value:(id)value {
+  NSError *error = nil;
+  if ([self.map put:key value:value error:&error]) {
+    return YES;
+  }
+  [self rnfb_removeHandle:value];
+  return NO;
+}
+
+- (id)get:(id)key {
+  return [self.map get:key];
+}
+
+- (id)take:(id)key {
+  return [self.map take:key];
+}
+
+- (void)takeAndRemove:(id)key {
+  id handle = [self.map take:key];
+  [self rnfb_removeHandle:handle];
+}
+
+- (void)removeAll {
+  NSArray *handlers = [self.map takeAll];
+  for (id handler in handlers) {
+    [self rnfb_removeHandle:handler];
+  }
+}
+
+@end

package/ios/RNFBAuthUnitTests/RNFBAuthCacheRegistryTests.m

@@ -0,0 +1,131 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "RNFBAuthCacheRegistry.h"
+#import "RNFBHandleMap.h"
+
+@interface RNFBAuthCacheRegistryTests : XCTestCase
+@property(nonatomic, strong) RNFBAuthCacheRegistry *registry;
+@end
+
+@implementation RNFBAuthCacheRegistryTests
+
+- (void)setUp {
+  [super setUp];
+  self.registry = [[RNFBAuthCacheRegistry alloc] init];
+}
+
+- (void)testPutGetTake_happyPath {
+  NSError *error = nil;
+  XCTAssertTrue([self.registry put:@"k1" value:@"payload" error:&error]);
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(@"payload", [self.registry get:@"k1"]);
+  XCTAssertEqualObjects(@"payload", [self.registry take:@"k1"]);
+  XCTAssertNil([self.registry get:@"k1"]);
+}
+
+- (void)testPut_occupiedId_returnsCollision {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+
+  NSError *error = nil;
+  XCTAssertFalse([self.registry put:@"k1" value:@"second" error:&error]);
+  XCTAssertNotNil(error);
+  XCTAssertEqualObjects(error.domain, RNFBHandleMapErrorDomain);
+  XCTAssertEqual(error.code, RNFBHandleMapErrorCollision);
+  XCTAssertEqualObjects(@"first", [self.registry get:@"k1"]);
+}
+
+- (void)testPut_occupiedId_nilErrorOut_returnsNo {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+  XCTAssertFalse([self.registry put:@"k1" value:@"second" error:nil]);
+  XCTAssertEqualObjects(@"first", [self.registry get:@"k1"]);
+}
+
+- (void)testGet_whenFree_isNil {
+  XCTAssertNil([self.registry get:@"missing"]);
+}
+
+- (void)testTake_whenFree_isNil {
+  XCTAssertNil([self.registry take:@"missing"]);
+}
+
+- (void)testPutOrDiscard_storesWhenFree {
+  XCTAssertTrue([self.registry putOrDiscard:@"k1" value:@"payload"]);
+  XCTAssertEqualObjects(@"payload", [self.registry get:@"k1"]);
+}
+
+- (void)testPutOrDiscard_collision_keepsExisting {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+  XCTAssertFalse([self.registry putOrDiscard:@"k1" value:@"second"]);
+  XCTAssertEqualObjects(@"first", [self.registry get:@"k1"]);
+}
+
+- (void)testPutReplacing_whenFree_stores {
+  XCTAssertTrue([self.registry putReplacing:@"k1" value:@"payload"]);
+  XCTAssertEqualObjects(@"payload", [self.registry get:@"k1"]);
+}
+
+- (void)testPutReplacing_whenOccupied_replacesLastWins {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+  XCTAssertTrue([self.registry putReplacing:@"k1" value:@"second"]);
+  XCTAssertEqualObjects(@"second", [self.registry get:@"k1"]);
+}
+
+- (void)testPutReplacing_sameIdFromTwoThreads_lastWins {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+
+  dispatch_group_t group = dispatch_group_create();
+  dispatch_group_enter(group);
+  dispatch_group_enter(group);
+
+  dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+    [self.registry putReplacing:@"k1" value:@"second"];
+    dispatch_group_leave(group);
+  });
+  dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+    [self.registry putReplacing:@"k1" value:@"third"];
+    dispatch_group_leave(group);
+  });
+
+  dispatch_group_wait(group, dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC));
+  id stored = [self.registry get:@"k1"];
+  XCTAssertTrue([stored isEqual:@"second"] || [stored isEqual:@"third"]);
+}
+
+- (void)testPut_afterTake_allowsReuse {
+  XCTAssertTrue([self.registry put:@"k1" value:@"first" error:nil]);
+  XCTAssertEqualObjects(@"first", [self.registry take:@"k1"]);
+  XCTAssertTrue([self.registry put:@"k1" value:@"second" error:nil]);
+  XCTAssertEqualObjects(@"second", [self.registry get:@"k1"]);
+}
+
+- (void)testClear_removesAll {
+  XCTAssertTrue([self.registry put:@"a" value:@"1" error:nil]);
+  XCTAssertTrue([self.registry put:@"b" value:@"2" error:nil]);
+  [self.registry clear];
+  XCTAssertNil([self.registry get:@"a"]);
+  XCTAssertNil([self.registry get:@"b"]);
+}
+
+- (void)testClear_empty_isNoOp {
+  [self.registry clear];
+  XCTAssertNil([self.registry get:@"k1"]);
+}
+
+@end