@react-native-firebase/auth 26.4.0 → 27.0.0

package/ios/RNFBAuth/RNFBAuthHelper.m

@@ -39,6 +39,17 @@
 #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);
@@ -88,68 +99,6 @@ 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 RNFBAuthListenerRegistry *authStateHandlers;
 static __strong RNFBAuthListenerRegistry *idTokenHandlers;
 static __strong NSMutableDictionary *emulatorConfigs;
@@ -652,15 +601,18 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
 
   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);
@@ -1100,8 +1052,7 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
                                   if (error) {
                                     [self promiseRejectAuthException:reject error:error];
                                   } else {
-                                    DLog(@"verificationID: %@", verificationID)
-                                        resolve(verificationID);
+                                    resolve(verificationID);
                                   }
                                 }];
 }
@@ -1115,8 +1066,6 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
   DLog(@"verifyPhoneNumberForMultifactor using app: %@", firebaseApp.name);
-  DLog(@"verifyPhoneNumberForMultifactor phoneNumber: %@", phoneNumber);
-  DLog(@"verifyPhoneNumberForMultifactor sessionKey: %@", sessionKey);
   FIRMultiFactorSession *session = [cachedSessions get:sessionKey];
   if (session == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
@@ -1155,8 +1104,6 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
       [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
           credentialWithVerificationID:verificationId
                       verificationCode:verificationCode];
-  DLog(@"credential: %@", credential);
-
   FIRMultiFactorAssertion *assertion =
       [FIRPhoneMultiFactorGenerator assertionWithCredential:credential];
 
@@ -1214,8 +1161,6 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
   DLog(@"using instance resolve generateTotpSecret: %@", firebaseApp.name);
 
   FIRMultiFactorSession *session = [cachedSessions get:sessionKey];
-  DLog(@"using sessionKey: %@", sessionKey);
-  DLog(@"using session: %@", session);
   [FIRTOTPMultiFactorGenerator
       generateSecretWithMultiFactorSession:session
                                 completion:^(FIRTOTPSecret *_Nullable totpSecret,
@@ -1225,9 +1170,7 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
                                   }
                                   else {
                                     NSString *secretKey = totpSecret.sharedSecretKey;
-                                    DLog(@"secretKey generated: %@", secretKey);
                                     [cachedTotpSecrets putReplacing:secretKey value:totpSecret];
-                                    DLog(@"cachedSecret: %@", [cachedTotpSecrets get:secretKey]);
                                     resolve(@{
                                       @"secretKey" : secretKey,
                                     });
@@ -1243,14 +1186,12 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
   DLog(@"generateQrCodeUrl using instance resolve generateQrCodeUrl: %@", firebaseApp.name);
-  DLog(@"generateQrCodeUrl using secretKey: %@", 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;
 }
 
@@ -1259,9 +1200,7 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
            qrCodeUri:(NSString *)qrCodeUri {
   [self initializeSharedStateOnce];
 
-  DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
   FIRTOTPSecret *totpSecret = [cachedTotpSecrets get:secretKey];
-  DLog(@"openInOtpApp using qrCodeUri: %@", qrCodeUri);
   [totpSecret openInOTPAppWithQRCodeURL:qrCodeUri];
 }
 
@@ -1348,8 +1287,6 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
   DLog(@"using instance finalizeTotpEnrollment: %@", firebaseApp.name);
 
   FIRTOTPSecret *cachedTotpSecret = [cachedTotpSecrets get:totpSecret];
-  DLog(@"using totpSecretKey: %@", totpSecret);
-  DLog(@"using cachedSecret: %@", cachedTotpSecret);
   FIRTOTPMultiFactorAssertion *assertion =
       [FIRTOTPMultiFactorGenerator assertionForEnrollmentWithSecret:cachedTotpSecret
                                                     oneTimePassword:verificationCode];
@@ -1910,82 +1847,15 @@ static __strong RNFBAuthCacheRegistry *cachedTotpSecrets;
 
 + (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;

package/ios/RNFBAuth/RNFBAuthListenerRegistry.m

@@ -23,12 +23,18 @@
 #import "RNFBApp/RNFBHandleMap.h"
 #endif
 
-@protocol RNFBAuthRemovable <NSObject>
-- (void)remove;
-@end
+#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 "RNFBAuthListenerRegistryStorage Swift interface not found"
+#endif
 
 @interface RNFBAuthListenerRegistry ()
-@property(nonatomic, strong) RNFBHandleMap *map;
+@property(nonatomic, strong) RNFBAuthListenerRegistryStorage *storage;
 @end
 
 @implementation RNFBAuthListenerRegistry
@@ -36,48 +42,42 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    _map = [[RNFBHandleMap alloc] init];
+    _storage = [[RNFBAuthListenerRegistryStorage 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];
+  if (![self.storage putIfAbsent:key value:value]) {
+    if (error != nil) {
+      NSString *message = [NSString stringWithFormat:@"Handle id already registered: %@", key];
+      *error = [NSError errorWithDomain:RNFBHandleMapErrorDomain
+                                   code:RNFBHandleMapErrorCollision
+                               userInfo:@{NSLocalizedDescriptionKey : message}];
+    }
+    return NO;
+  }
+  return YES;
 }
 
 - (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;
+  return [self.storage putOrDiscard:key value:value];
 }
 
 - (id)get:(id)key {
-  return [self.map get:key];
+  return [self.storage get:key];
 }
 
 - (id)take:(id)key {
-  return [self.map take:key];
+  return [self.storage take:key];
 }
 
 - (void)takeAndRemove:(id)key {
-  id handle = [self.map take:key];
-  [self rnfb_removeHandle:handle];
+  [self.storage takeAndRemove:key];
 }
 
 - (void)removeAll {
-  NSArray *handlers = [self.map takeAll];
-  for (id handler in handlers) {
-    [self rnfb_removeHandle:handler];
-  }
+  [self.storage removeAll];
 }
 
 @end

package/ios/RNFBAuth/RNFBAuthListenerRegistryStorage.swift

@@ -0,0 +1,76 @@
+/**
+ * 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
+
+#if canImport(RNFBApp)
+import RNFBApp
+#endif
+
+/// Auth-state / id-token listener map storage. Composes `RNFBHandleMapStorage`.
+/// `putOrDiscard` is first-wins and calls `remove` on the incoming value on collision.
+/// Unique `put` collision errors stay on the ObjC façade.
+@objc(RNFBAuthListenerRegistryStorage)
+public final class RNFBAuthListenerRegistryStorage: NSObject {
+  private static let removeSelector = Selector(("remove"))
+
+  private let storage = RNFBHandleMapStorage()
+
+  private func removeHandle(_ handle: AnyObject?) {
+    guard let handle = handle, handle.responds(to: Self.removeSelector) else {
+      return
+    }
+    _ = handle.perform(Self.removeSelector)
+  }
+
+  /// First-wins store without discarding the incoming value. Used by façade `put`.
+  @objc(putIfAbsent:value:)
+  public func putIfAbsent(_ key: AnyObject, value: AnyObject) -> Bool {
+    storage.putIfAbsent(key, value: value)
+  }
+
+  /// Unique put. On collision, `remove`s the incoming value and leaves the existing mapping.
+  @objc(putOrDiscard:value:)
+  public func putOrDiscard(_ key: AnyObject, value: AnyObject) -> Bool {
+    if storage.putIfAbsent(key, value: value) {
+      return true
+    }
+    removeHandle(value)
+    return false
+  }
+
+  @objc(get:)
+  public func get(_ key: AnyObject) -> AnyObject? {
+    storage.get(key)
+  }
+
+  @objc(take:)
+  public func take(_ key: AnyObject) -> AnyObject? {
+    storage.take(key)
+  }
+
+  @objc(takeAndRemove:)
+  public func takeAndRemove(_ key: AnyObject) {
+    removeHandle(storage.take(key))
+  }
+
+  @objc
+  public func removeAll() {
+    for handle in storage.takeAll() {
+      removeHandle(handle)
+    }
+  }
+}

package/ios/RNFBAuth/RNFBAuthNullSentinelDecoder.h

@@ -0,0 +1,40 @@
+/**
+ * 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>
+
+/**
+ * Decodes New Architecture null sentinels for updateProfile. Foundation only so unit tests can
+ * compile it without the Firebase SDK.
+ */
+@interface RNFBAuthNullSentinelDecoder : NSObject
+
+/**
+ * Decode sentinels and turn NSNull into nil before profileChangeRequest writes.
+ * FIRUserProfileChangeRequest clears a field when the property is set to nil (not the same as
+ * leaving it unassigned). NSDictionary cannot store nil, so cleared keys are omitted and
+ * subscript returns nil, the same value updateProfile reads.
+ * displayName/photoURL null arrive as { __rnfbNull: true } and/or NSNull after decode.
+ */
++ (NSDictionary *)decodedProfileProps:(NSDictionary *)props;
+
+/**
+ * photoURL clear arm: omitted/nil decoded value must become nil (not @""), not URLWithString:.
+ */
++ (NSURL *)photoURLFromDecodedValue:(id)value;
+
+@end

package/ios/RNFBAuth/RNFBAuthNullSentinelDecoder.m

@@ -0,0 +1,49 @@
+/**
+ * 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 "RNFBAuthNullSentinelDecoder.h"
+
+#if __has_include(<RNFBApp/RNFBApp-Swift.h>)
+#import <RNFBApp/RNFBApp-Swift.h>
+#elif __has_include("RNFBApp-Swift.h")
+#import "RNFBApp-Swift.h"
+#elif __has_include("RNFBHandleMapStorage-Swift.inc")
+#import "RNFBHandleMapStorage-Swift.inc"
+#else
+#error "RNFBApp Swift interface not found"
+#endif
+
+@implementation RNFBAuthNullSentinelDecoder
+
++ (NSDictionary *)decodedProfileProps:(NSDictionary *)props {
+  NSDictionary *decoded = [RNFBNullSentinelDecoder decodeNullSentinels:props];
+  NSMutableDictionary *normalized = [NSMutableDictionary dictionaryWithCapacity:decoded.count];
+  for (NSString *key in decoded) {
+    id value = decoded[key];
+    if (value == [NSNull null]) {
+      continue;
+    }
+    normalized[key] = value;
+  }
+  return normalized;
+}
+
++ (NSURL *)photoURLFromDecodedValue:(id)value {
+  return value == nil ? nil : [NSURL URLWithString:value];
+}
+
+@end

package/ios/RNFBAuth.xcodeproj/project.pbxproj

@@ -8,6 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		2744B98621F45429004F8E3F /* RNFBAuthModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2744B98521F45429004F8E3F /* RNFBAuthModule.mm */; };
+		RNFBAUTH0000000000000001 /* RNFBAuthCacheRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = RNFBAUTH0000000000000002 /* RNFBAuthCacheRegistry.m */; };
+		RNFBAUTH0000000000000003 /* RNFBAuthCacheRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBAUTH0000000000000004 /* RNFBAuthCacheRegistryStorage.swift */; };
+		RNFBAUTH0000000000000008 /* RNFBAuthListenerRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBAUTH0000000000000009 /* RNFBAuthListenerRegistryStorage.swift */; };
+		RNFBAUTH000000000000000A /* RNFBAuthErrorCodeMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBAUTH000000000000000B /* RNFBAuthErrorCodeMapper.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,6 +30,11 @@
 		2744B98221F45429004F8E3F /* libRNFBAuth.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBAuth.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		2744B98421F45429004F8E3F /* RNFBAuthModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBAuthModule.h; path = RNFBAuth/RNFBAuthModule.h; sourceTree = SOURCE_ROOT; };
 		2744B98521F45429004F8E3F /* RNFBAuthModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = RNFBAuthModule.mm; path = RNFBAuth/RNFBAuthModule.mm; sourceTree = SOURCE_ROOT; };
+		RNFBAUTH0000000000000005 /* RNFBAuthCacheRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBAuthCacheRegistry.h; path = RNFBAuth/RNFBAuthCacheRegistry.h; sourceTree = SOURCE_ROOT; };
+		RNFBAUTH0000000000000002 /* RNFBAuthCacheRegistry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFBAuthCacheRegistry.m; path = RNFBAuth/RNFBAuthCacheRegistry.m; sourceTree = SOURCE_ROOT; };
+		RNFBAUTH0000000000000004 /* RNFBAuthCacheRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAuthCacheRegistryStorage.swift; path = RNFBAuth/RNFBAuthCacheRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
+		RNFBAUTH0000000000000009 /* RNFBAuthListenerRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAuthListenerRegistryStorage.swift; path = RNFBAuth/RNFBAuthListenerRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
+		RNFBAUTH000000000000000B /* RNFBAuthErrorCodeMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAuthErrorCodeMapper.swift; path = RNFBAuth/RNFBAuthErrorCodeMapper.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -52,6 +61,11 @@
 			children = (
 				2744B9A121F48736004F8E3F /* converters */,
 				2744B98C21F45C64004F8E3F /* common */,
+				RNFBAUTH0000000000000005 /* RNFBAuthCacheRegistry.h */,
+				RNFBAUTH0000000000000002 /* RNFBAuthCacheRegistry.m */,
+				RNFBAUTH0000000000000004 /* RNFBAuthCacheRegistryStorage.swift */,
+				RNFBAUTH0000000000000009 /* RNFBAuthListenerRegistryStorage.swift */,
+				RNFBAUTH000000000000000B /* RNFBAuthErrorCodeMapper.swift */,
 				2744B98421F45429004F8E3F /* RNFBAuthModule.h */,
 				2744B98521F45429004F8E3F /* RNFBAuthModule.mm */,
 			);
@@ -124,6 +138,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				RNFBAUTH0000000000000003 /* RNFBAuthCacheRegistryStorage.swift in Sources */,
+				RNFBAUTH0000000000000001 /* RNFBAuthCacheRegistry.m in Sources */,
+				RNFBAUTH0000000000000008 /* RNFBAuthListenerRegistryStorage.swift in Sources */,
+				RNFBAUTH000000000000000A /* RNFBAuthErrorCodeMapper.swift in Sources */,
 				2744B98621F45429004F8E3F /* RNFBAuthModule.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -150,6 +168,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -166,6 +185,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -189,6 +209,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -200,6 +221,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};