@react-native-firebase/auth 25.1.0 → 26.1.0

package/ios/RNFBAuth/{RNFBAuthModule.m → RNFBAuthHelper.m}

@@ -15,13 +15,34 @@
  *
  */
 
+#if __has_include(<Firebase/Firebase.h>)
 #import <Firebase/Firebase.h>
+#else
+@import FirebaseCore;
+@import FirebaseAuth;
+// `@import FirebaseAuth` alone only exposes the Swift-generated interop header
+// (the real `FIRAuth`/`FIRUser` classes). The hand-written ObjC compatibility
+// headers under `Public/FirebaseAuth/` (typedefs like
+// `FIRAuthStateDidChangeListenerHandle`, error userInfo key constants, etc.)
+// are vended by the separate `FirebaseAuthInternal` Clang module, which isn't
+// automatically re-exported by `@import FirebaseAuth` -- it must be imported
+// explicitly too, even though it's a direct (not transitive) SPM dependency of
+// `FirebaseAuth`. See okf-bundle/ios-spm-native-imports.md.
+@import FirebaseAuthInternal;
+#endif
+#import <React/RCTConvert.h>
 #import <React/RCTUtils.h>
 
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBApp/RNFBAppModule.h"
 #import "RNFBApp/RNFBSharedUtils.h"
-#import "RNFBAuthModule.h"
+#import "RNFBAuthHelper.h"
+
+static void RNFBAuthThrowSyncErrorWithCode(NSString *code, NSString *message) {
+  @throw [NSException exceptionWithName:code
+                                 reason:message
+                               userInfo:@{@"code" : code, @"message" : message}];
+}
 
 static NSString *const keyIOS = @"iOS";
 static NSString *const keyUrl = @"url";
@@ -50,6 +71,68 @@ 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 NSMutableDictionary *emulatorConfigs;
@@ -61,18 +144,60 @@ static __strong NSMutableDictionary<NSString *, FIRMultiFactorSession *> *cached
 static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecrets;
 #endif
 
-@implementation RNFBAuthModule
-#pragma mark -
-#pragma mark Module Setup
+@interface RNFBAuthHelper ()
 
-RCT_EXPORT_MODULE();
++ (NSString *)nonEmptyStringFromDictionary:(NSDictionary *)dictionary key:(NSString *)key;
++ (NSPersonNameComponents *)personNameComponentsFromDictionary:(NSDictionary *)dictionary;
 
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
++ (FIRAuthCredential *)getCredentialForProvider:(NSString *)provider
+                                          token:(NSString *)authToken
+                                         secret:(NSString *)authTokenSecret
+                                    firebaseApp:(FIRApp *)firebaseApp;
+
++ (void)reloadAndReturnUser:(FIRUser *)user
+                   resolver:(RCTPromiseResolveBlock)resolve
+                   rejecter:(RCTPromiseRejectBlock)reject
+                firebaseApp:(FIRApp *)firebaseApp;
+
++ (void)promiseNoUser:(RCTPromiseResolveBlock)resolve
+             rejecter:(RCTPromiseRejectBlock)reject
+              isError:(BOOL)isError;
+
+#if TARGET_OS_IOS
++ (NSDictionary *)multiFactorResolverToDict:(FIRMultiFactorResolver *)resolver;
+#endif
+
++ (void)promiseRejectAuthException:(RCTPromiseRejectBlock)reject error:(NSError *)error;
++ (NSDictionary *)getJSError:(NSError *)error;
+
++ (void)promiseWithUser:(RCTPromiseResolveBlock)resolve
+               rejecter:(RCTPromiseRejectBlock)reject
+                   user:(FIRUser *)user;
+
++ (void)promiseWithAuthResult:(RCTPromiseResolveBlock)resolve
+                     rejecter:(RCTPromiseRejectBlock)reject
+                   authResult:(FIRAuthDataResult *)authResult;
+
++ (NSArray<NSObject *> *)convertProviderData:(NSArray<id<FIRUserInfo>> *)providerData;
++ (NSDictionary *)firebaseUserToDict:(FIRUser *)user;
+
+#if TARGET_OS_IOS
++ (NSArray<NSMutableDictionary *> *)convertMultiFactorData:(NSArray<FIRMultiFactorInfo *> *)hints;
+#endif
+
++ (NSDictionary *)authCredentialToDict:(FIRAuthCredential *)authCredential;
++ (FIRActionCodeSettings *)buildActionCodeSettings:(NSDictionary *)actionCodeSettings;
+
++ (void)initializeSharedStateOnce;
+
+@end
+
+@implementation RNFBAuthHelper
+
+#pragma mark -
+#pragma mark Shared state
 
-- (id)init {
-  self = [super init];
++ (void)initializeSharedStateOnce {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     authStateHandlers = [[NSMutableDictionary alloc] init];
@@ -85,14 +210,11 @@ RCT_EXPORT_MODULE();
     cachedTotpSecrets = [[NSMutableDictionary alloc] init];
 #endif
   });
-  return self;
 }
 
-- (void)dealloc {
-  [self invalidate];
-}
++ (void)invalidate {
+  [self initializeSharedStateOnce];
 
-- (void)invalidate {
   for (NSString *key in authStateHandlers) {
     FIRApp *firebaseApp = [RCTConvert firAppFromString:key];
 
@@ -119,7 +241,10 @@ RCT_EXPORT_MODULE();
 #pragma mark -
 #pragma mark Firebase Auth Methods
 
-RCT_EXPORT_METHOD(addAuthStateListener : (FIRApp *)firebaseApp) {
++ (void)addAuthStateListener:(NSString *)appName {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if (![authStateHandlers valueForKey:firebaseApp.name]) {
     FIRAuthStateDidChangeListenerHandle newListenerHandle = [[FIRAuth authWithApp:firebaseApp]
         addAuthStateDidChangeListener:^(FIRAuth *_Nonnull auth, FIRUser *_Nullable user) {
@@ -135,7 +260,10 @@ RCT_EXPORT_METHOD(addAuthStateListener : (FIRApp *)firebaseApp) {
   }
 }
 
-RCT_EXPORT_METHOD(removeAuthStateListener : (FIRApp *)firebaseApp) {
++ (void)removeAuthStateListener:(NSString *)appName {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if ([authStateHandlers valueForKey:firebaseApp.name]) {
     [[FIRAuth authWithApp:firebaseApp]
         removeAuthStateDidChangeListener:[authStateHandlers valueForKey:firebaseApp.name]];
@@ -143,7 +271,10 @@ RCT_EXPORT_METHOD(removeAuthStateListener : (FIRApp *)firebaseApp) {
   }
 }
 
-RCT_EXPORT_METHOD(addIdTokenListener : (FIRApp *)firebaseApp) {
++ (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) {
@@ -161,7 +292,10 @@ RCT_EXPORT_METHOD(addIdTokenListener : (FIRApp *)firebaseApp) {
   }
 }
 
-RCT_EXPORT_METHOD(removeIdTokenListener : (FIRApp *)firebaseApp) {
++ (void)removeIdTokenListener:(NSString *)appName {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if ([idTokenHandlers valueForKey:firebaseApp.name]) {
     [[FIRAuth authWithApp:firebaseApp]
         removeIDTokenDidChangeListener:[idTokenHandlers valueForKey:firebaseApp.name]];
@@ -169,7 +303,9 @@ RCT_EXPORT_METHOD(removeIdTokenListener : (FIRApp *)firebaseApp) {
   }
 }
 
-RCT_EXPORT_METHOD(configureAuthDomain : (FIRApp *)firebaseApp) {
++ (void)configureAuthDomain:(NSString *)appName {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSString *authDomain = [RNFBAppModule getCustomDomain:firebaseApp.name];
   DLog(@"RNFBAuth app: %@ customAuthDomain: %@", firebaseApp.name, authDomain);
   if (authDomain != nil) {
@@ -177,22 +313,30 @@ RCT_EXPORT_METHOD(configureAuthDomain : (FIRApp *)firebaseApp) {
   }
 }
 
-RCT_EXPORT_METHOD(getCustomAuthDomain
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)getCustomAuthDomain:(NSString *)appName
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   resolve([FIRAuth authWithApp:firebaseApp].customAuthDomain);
 }
 
-RCT_EXPORT_METHOD(setAppVerificationDisabledForTesting : (FIRApp *)firebaseApp : (BOOL)disabled) {
++ (void)setAppVerificationDisabledForTesting:(NSString *)appName
+                                    disabled:(BOOL)disabled
+                                     resolve:(RCTPromiseResolveBlock)resolve
+                                      reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [FIRAuth authWithApp:firebaseApp].settings.appVerificationDisabledForTesting = disabled;
+  resolve([NSNull null]);
 }
 
-RCT_EXPORT_METHOD(useUserAccessGroup
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)userAccessGroup
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)useUserAccessGroup:(NSString *)appName
+           userAccessGroup:(NSString *)userAccessGroup
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSError *error;
   [[FIRAuth authWithApp:firebaseApp] useUserAccessGroup:userAccessGroup error:&error];
 
@@ -204,10 +348,11 @@ RCT_EXPORT_METHOD(useUserAccessGroup
   return;
 }
 
-RCT_EXPORT_METHOD(signOut
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signOut:(NSString *)appName
+        resolve:(RCTPromiseResolveBlock)resolve
+         reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -224,10 +369,11 @@ RCT_EXPORT_METHOD(signOut
   [self promiseNoUser:resolve rejecter:reject isError:YES];
 }
 
-RCT_EXPORT_METHOD(signInAnonymously
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInAnonymously:(NSString *)appName
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       signInAnonymouslyWithCompletion:^(FIRAuthDataResult *authResult, NSError *error) {
         if (error) {
@@ -238,12 +384,13 @@ RCT_EXPORT_METHOD(signInAnonymously
       }];
 }
 
-RCT_EXPORT_METHOD(signInWithEmailAndPassword
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSString *)password
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithEmailAndPassword:(NSString *)appName
+                             email:(NSString *)email
+                          password:(NSString *)password
+                           resolve:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       signInWithEmail:email
              password:password
@@ -256,21 +403,20 @@ RCT_EXPORT_METHOD(signInWithEmailAndPassword
            }];
 }
 
-RCT_EXPORT_METHOD(isSignInWithEmailLink
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)emailLink
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
-  resolve(
-      @([RCTConvert BOOL:@([[FIRAuth authWithApp:firebaseApp] isSignInWithEmailLink:emailLink])]));
++ (NSNumber *)isSignInWithEmailLink:(NSString *)appName emailLink:(NSString *)emailLink {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
+  return
+      @([RCTConvert BOOL:@([[FIRAuth authWithApp:firebaseApp] isSignInWithEmailLink:emailLink])]);
 }
 
-RCT_EXPORT_METHOD(signInWithEmailLink
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSString *)emailLink
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithEmailLink:(NSString *)appName
+                      email:(NSString *)email
+                  emailLink:(NSString *)emailLink
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       signInWithEmail:email
                  link:emailLink
@@ -283,12 +429,13 @@ RCT_EXPORT_METHOD(signInWithEmailLink
            }];
 }
 
-RCT_EXPORT_METHOD(createUserWithEmailAndPassword
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSString *)password
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)createUserWithEmailAndPassword:(NSString *)appName
+                                 email:(NSString *)email
+                              password:(NSString *)password
+                               resolve:(RCTPromiseResolveBlock)resolve
+                                reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       createUserWithEmail:email
                  password:password
@@ -301,10 +448,11 @@ RCT_EXPORT_METHOD(createUserWithEmailAndPassword
                }];
 }
 
-RCT_EXPORT_METHOD(delete
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)deleteUser:(NSString *)appName
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -320,10 +468,11 @@ RCT_EXPORT_METHOD(delete
   }
 }
 
-RCT_EXPORT_METHOD(reload
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)reload:(NSString *)appName
+       resolve:(RCTPromiseResolveBlock)resolve
+        reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
   if (user) {
     [self reloadAndReturnUser:user resolver:resolve rejecter:reject firebaseApp:firebaseApp];
@@ -332,11 +481,12 @@ RCT_EXPORT_METHOD(reload
   }
 }
 
-RCT_EXPORT_METHOD(sendEmailVerification
-                  : (FIRApp *)firebaseApp
-                  : (NSDictionary *)actionCodeSettings
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)sendEmailVerification:(NSString *)appName
+           actionCodeSettings:(NSDictionary *)actionCodeSettings
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
   if (user) {
     id handler = ^(NSError *_Nullable error) {
@@ -358,12 +508,13 @@ RCT_EXPORT_METHOD(sendEmailVerification
   }
 }
 
-RCT_EXPORT_METHOD(verifyBeforeUpdateEmail
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSDictionary *)actionCodeSettings
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)verifyBeforeUpdateEmail:(NSString *)appName
+                          email:(NSString *)email
+             actionCodeSettings:(NSDictionary *)actionCodeSettings
+                        resolve:(RCTPromiseResolveBlock)resolve
+                         reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
   if (user) {
     id handler = ^(NSError *_Nullable error) {
@@ -387,11 +538,12 @@ RCT_EXPORT_METHOD(verifyBeforeUpdateEmail
   }
 }
 
-RCT_EXPORT_METHOD(updateEmail
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)updateEmail:(NSString *)appName
+              email:(NSString *)email
+            resolve:(RCTPromiseResolveBlock)resolve
+             reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -411,11 +563,12 @@ RCT_EXPORT_METHOD(updateEmail
   }
 }
 
-RCT_EXPORT_METHOD(updatePassword
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)password
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)updatePassword:(NSString *)appName
+              password:(NSString *)password
+               resolve:(RCTPromiseResolveBlock)resolve
+                reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -434,13 +587,14 @@ RCT_EXPORT_METHOD(updatePassword
 }
 
 #if TARGET_OS_IOS
-RCT_EXPORT_METHOD(updatePhoneNumber
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)provider
-                  : (NSString *)authToken
-                  : (NSString *)authSecret
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)updatePhoneNumber:(NSString *)appName
+                 provider:(NSString *)provider
+                authToken:(NSString *)authToken
+               authSecret:(NSString *)authSecret
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -476,11 +630,12 @@ RCT_EXPORT_METHOD(updatePhoneNumber
 }
 #endif
 
-RCT_EXPORT_METHOD(updateProfile
-                  : (FIRApp *)firebaseApp
-                  : (NSDictionary *)props
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)updateProfile:(NSString *)appName
+                props:(NSDictionary *)props
+              resolve:(RCTPromiseResolveBlock)resolve
+               reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -512,11 +667,12 @@ RCT_EXPORT_METHOD(updateProfile
   }
 }
 
-RCT_EXPORT_METHOD(getIdToken
-                  : (FIRApp *)firebaseApp
-                  : (BOOL)forceRefresh
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)getIdToken:(NSString *)appName
+      forceRefresh:(BOOL)forceRefresh
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -533,11 +689,12 @@ RCT_EXPORT_METHOD(getIdToken
   }
 }
 
-RCT_EXPORT_METHOD(getIdTokenResult
-                  : (FIRApp *)firebaseApp
-                  : (BOOL)forceRefresh
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)getIdTokenResult:(NSString *)appName
+            forceRefresh:(BOOL)forceRefresh
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -579,17 +736,33 @@ RCT_EXPORT_METHOD(getIdTokenResult
   }
 }
 
-RCT_EXPORT_METHOD(signInWithCredential
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)provider
-                  : (NSString *)authToken
-                  : (NSString *)authSecret
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithCredential:(NSString *)appName
+                    provider:(NSString *)provider
+                   authToken:(NSString *)authToken
+                  authSecret:(NSString *)authSecret
+                    fullName:(NSDictionary *)fullName
+                     resolve:(RCTPromiseResolveBlock)resolve
+                      reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRAuthCredential *credential = [self getCredentialForProvider:provider
                                                            token:authToken
                                                           secret:authSecret
                                                      firebaseApp:firebaseApp];
+
+  // Sign in with Apple: if the caller supplied a non-empty fullName (only available on the
+  // user's first authorization), rebuild the credential so Firebase can store displayName.
+  // See AppleFullPersonName in auth.ts.
+  if ([provider compare:@"apple.com" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+    NSPersonNameComponents *personNameComponents =
+        [self personNameComponentsFromDictionary:fullName];
+    if (personNameComponents != nil) {
+      credential = [FIROAuthProvider appleCredentialWithIDToken:authToken
+                                                       rawNonce:authSecret
+                                                       fullName:personNameComponents];
+    }
+  }
+
   if (credential == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
                                       userInfo:(NSMutableDictionary *)@{
@@ -611,11 +784,12 @@ RCT_EXPORT_METHOD(signInWithCredential
                 }];
 }
 
-RCT_EXPORT_METHOD(signInWithProvider
-                  : (FIRApp *)firebaseApp
-                  : (NSDictionary *)provider
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithProvider:(NSString *)appName
+                  provider:(NSDictionary *)provider
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSString *providerId = provider[@"providerId"];
   if (providerId == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
@@ -671,12 +845,13 @@ RCT_EXPORT_METHOD(signInWithProvider
 #endif
 }
 
-RCT_EXPORT_METHOD(confirmPasswordReset
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)code
-                  : (NSString *)newPassword
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)confirmPasswordReset:(NSString *)appName
+                        code:(NSString *)code
+                 newPassword:(NSString *)newPassword
+                     resolve:(RCTPromiseResolveBlock)resolve
+                      reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       confirmPasswordResetWithCode:code
                        newPassword:newPassword
@@ -689,11 +864,12 @@ RCT_EXPORT_METHOD(confirmPasswordReset
                         }];
 }
 
-RCT_EXPORT_METHOD(applyActionCode
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)code
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)applyActionCode:(NSString *)appName
+                   code:(NSString *)code
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       applyActionCode:code
            completion:^(NSError *_Nullable error) {
@@ -707,11 +883,12 @@ RCT_EXPORT_METHOD(applyActionCode
            }];
 }
 
-RCT_EXPORT_METHOD(checkActionCode
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)code
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)checkActionCode:(NSString *)appName
+                   code:(NSString *)code
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       checkActionCode:code
            completion:^(FIRActionCodeInfo *_Nullable info, NSError *_Nullable error) {
@@ -763,11 +940,12 @@ RCT_EXPORT_METHOD(checkActionCode
            }];
 }
 
-RCT_EXPORT_METHOD(revokeToken
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)authorizationCode
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)revokeToken:(NSString *)appName
+    authorizationCode:(NSString *)authorizationCode
+              resolve:(RCTPromiseResolveBlock)resolve
+               reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       revokeTokenWithAuthorizationCode:authorizationCode
                             completion:^(NSError *_Nullable error) {
@@ -779,12 +957,13 @@ RCT_EXPORT_METHOD(revokeToken
                             }];
 }
 
-RCT_EXPORT_METHOD(sendPasswordResetEmail
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSDictionary *)actionCodeSettings
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)sendPasswordResetEmail:(NSString *)appName
+                         email:(NSString *)email
+            actionCodeSettings:(NSDictionary *)actionCodeSettings
+                       resolve:(RCTPromiseResolveBlock)resolve
+                        reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   id handler = ^(NSError *_Nullable error) {
     if (error) {
       [self promiseRejectAuthException:reject error:error];
@@ -803,12 +982,13 @@ RCT_EXPORT_METHOD(sendPasswordResetEmail
   }
 }
 
-RCT_EXPORT_METHOD(sendSignInLinkToEmail
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (NSDictionary *)actionCodeSettings
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)sendSignInLinkToEmail:(NSString *)appName
+                        email:(NSString *)email
+           actionCodeSettings:(NSDictionary *)actionCodeSettings
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   id handler = ^(NSError *_Nullable error) {
     if (error) {
       [self promiseRejectAuthException:reject error:error];
@@ -823,11 +1003,12 @@ RCT_EXPORT_METHOD(sendSignInLinkToEmail
                                                 completion:handler];
 }
 
-RCT_EXPORT_METHOD(signInWithCustomToken
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)customToken
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithCustomToken:(NSString *)appName
+                  customToken:(NSString *)customToken
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       signInWithCustomToken:customToken
                  completion:^(FIRAuthDataResult *authResult, NSError *error) {
@@ -840,13 +1021,17 @@ RCT_EXPORT_METHOD(signInWithCustomToken
 }
 
 #if TARGET_OS_IOS
-RCT_EXPORT_METHOD(signInWithPhoneNumber
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)phoneNumber
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)signInWithPhoneNumber:(NSString *)appName
+                  phoneNumber:(NSString *)phoneNumber
+                  forceResend:(BOOL)forceResend
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"SignInWthPhoneNumber instance: %@", firebaseApp.name);
 
+  (void)forceResend;
+
   [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
       verifyPhoneNumber:phoneNumber
              UIDelegate:nil
@@ -860,12 +1045,15 @@ RCT_EXPORT_METHOD(signInWithPhoneNumber
                }
              }];
 }
-RCT_EXPORT_METHOD(verifyPhoneNumberWithMultiFactorInfo
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)hintUid
-                  : (NSString *)sessionKey
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
+
++ (void)verifyPhoneNumberWithMultiFactorInfo:(NSString *)appName
+                                     hintUid:(NSString *)hintUid
+                                  sessionKey:(NSString *)sessionKey
+                                     resolve:(RCTPromiseResolveBlock)resolve
+                                      reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if ([cachedResolver valueForKey:sessionKey] == nil) {
     [RNFBSharedUtils
         rejectPromiseWithUserInfo:reject
@@ -905,16 +1093,18 @@ RCT_EXPORT_METHOD(verifyPhoneNumberWithMultiFactorInfo
                                 }];
 }
 
-RCT_EXPORT_METHOD(verifyPhoneNumberForMultiFactor
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)phoneNumber
-                  : (NSString *)sessionId
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)verifyPhoneNumberForMultiFactor:(NSString *)appName
+                            phoneNumber:(NSString *)phoneNumber
+                             sessionKey:(NSString *)sessionKey
+                                resolve:(RCTPromiseResolveBlock)resolve
+                                 reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"verifyPhoneNumberForMultifactor using app: %@", firebaseApp.name);
   DLog(@"verifyPhoneNumberForMultifactor phoneNumber: %@", phoneNumber);
-  DLog(@"verifyPhoneNumberForMultifactor sessionId: %@", sessionId);
-  FIRMultiFactorSession *session = cachedSessions[sessionId];
+  DLog(@"verifyPhoneNumberForMultifactor sessionKey: %@", sessionKey);
+  FIRMultiFactorSession *session = cachedSessions[sessionKey];
   if (session == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
                                       userInfo:(NSMutableDictionary *)@{
@@ -937,13 +1127,15 @@ RCT_EXPORT_METHOD(verifyPhoneNumberForMultiFactor
               }];
 }
 
-RCT_EXPORT_METHOD(resolveMultiFactorSignIn
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)sessionKey
-                  : (NSString *)verificationId
-                  : (NSString *)verificationCode
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)resolveMultiFactorSignIn:(NSString *)appName
+                         session:(NSString *)session
+                  verificationId:(NSString *)verificationId
+                verificationCode:(NSString *)verificationCode
+                         resolve:(RCTPromiseResolveBlock)resolve
+                          reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance resolve MultiFactorSignIn: %@", firebaseApp.name);
 
   FIRPhoneAuthCredential *credential =
@@ -955,28 +1147,29 @@ RCT_EXPORT_METHOD(resolveMultiFactorSignIn
   FIRMultiFactorAssertion *assertion =
       [FIRPhoneMultiFactorGenerator assertionWithCredential:credential];
 
-  [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];
-                                                }
-                                              }];
-}
+  [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];
+                                             }
+                                           }];
+}
+
++ (void)resolveTotpSignIn:(NSString *)appName
+               sessionKey:(NSString *)sessionKey
+                      uid:(NSString *)uid
+          oneTimePassword:(NSString *)oneTimePassword
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
 
-RCT_EXPORT_METHOD(resolveTotpSignIn
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)sessionKey
-                  : (NSString *)uid
-                  : (NSString *)oneTimePassword
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
   DLog(@"using instance resolve TotpSignIn: %@", firebaseApp.name);
 
   FIRMultiFactorAssertion *assertion =
@@ -997,11 +1190,13 @@ RCT_EXPORT_METHOD(resolveTotpSignIn
                                               }];
 }
 
-RCT_EXPORT_METHOD(generateTotpSecret
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)sessionKey
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)generateTotpSecret:(NSString *)appName
+                sessionKey:(NSString *)sessionKey
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance resolve generateTotpSecret: %@", firebaseApp.name);
 
   FIRMultiFactorSession *session = cachedSessions[sessionKey];
@@ -1026,35 +1221,42 @@ RCT_EXPORT_METHOD(generateTotpSecret
                                 }];
 }
 
-RCT_EXPORT_METHOD(generateQrCodeUrl
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)secretKey
-                  : (NSString *)accountName
-                  : (NSString *)issuer
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (NSString *)generateQrCodeUrl:(NSString *)appName
+                      secretKey:(NSString *)secretKey
+                        account:(NSString *)account
+                         issuer:(NSString *)issuer {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"generateQrCodeUrl using instance resolve generateQrCodeUrl: %@", firebaseApp.name);
   DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
   FIRTOTPSecret *totpSecret = cachedTotpSecrets[secretKey];
-  NSString *url = [totpSecret generateQRCodeURLWithAccountName:accountName issuer:issuer];
+  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);
-  resolve(url);
+  return url;
 }
 
-RCT_EXPORT_METHOD(openInOtpApp
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)secretKey
-                  : (NSString *)qrCodeUri) {
++ (void)openInOtpApp:(NSString *)appName
+           secretKey:(NSString *)secretKey
+           qrCodeUri:(NSString *)qrCodeUri {
+  [self initializeSharedStateOnce];
+
   DLog(@"generateQrCodeUrl using secretKey: %@", secretKey);
   FIRTOTPSecret *totpSecret = cachedTotpSecrets[secretKey];
   DLog(@"openInOtpApp using qrCodeUri: %@", qrCodeUri);
   [totpSecret openInOTPAppWithQRCodeURL:qrCodeUri];
 }
 
-RCT_EXPORT_METHOD(getSession
-                  : (FIRApp *)firebaseApp
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)getSession:(NSString *)appName
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
   [[user multiFactor] getSessionWithCompletion:^(FIRMultiFactorSession *_Nullable session,
                                                  NSError *_Nullable error) {
@@ -1069,11 +1271,12 @@ RCT_EXPORT_METHOD(getSession
   }];
 }
 
-RCT_EXPORT_METHOD(unenrollMultiFactor
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)factorUID
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)unenrollMultiFactor:(NSString *)appName
+                  factorUID:(NSString *)factorUID
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance unenrollMultiFactor: %@", firebaseApp.name);
 
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
@@ -1089,13 +1292,14 @@ RCT_EXPORT_METHOD(unenrollMultiFactor
                                }];
 }
 
-RCT_EXPORT_METHOD(finalizeMultiFactorEnrollment
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)verificationId
-                  : (NSString *)verificationCode
-                  : (NSString *_Nullable)displayName
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)finalizeMultiFactorEnrollment:(NSString *)appName
+                       verificationId:(NSString *)verificationId
+                     verificationCode:(NSString *)verificationCode
+                          displayName:(NSString *_Nullable)displayName
+                              resolve:(RCTPromiseResolveBlock)resolve
+                               reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance finalizeMultifactorEnrollment: %@", firebaseApp.name);
 
   FIRPhoneAuthCredential *credential =
@@ -1118,13 +1322,15 @@ RCT_EXPORT_METHOD(finalizeMultiFactorEnrollment
                              }];
 }
 
-RCT_EXPORT_METHOD(finalizeTotpEnrollment
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)totpSecret
-                  : (NSString *)verificationCode
-                  : (NSString *_Nullable)displayName
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)finalizeTotpEnrollment:(NSString *)appName
+                    totpSecret:(NSString *)totpSecret
+              verificationCode:(NSString *)verificationCode
+                   displayName:(NSString *_Nullable)displayName
+                       resolve:(RCTPromiseResolveBlock)resolve
+                        reject:(RCTPromiseRejectBlock)reject {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance finalizeTotpEnrollment: %@", firebaseApp.name);
 
   FIRTOTPSecret *cachedTotpSecret = cachedTotpSecrets[totpSecret];
@@ -1149,10 +1355,13 @@ RCT_EXPORT_METHOD(finalizeTotpEnrollment
                              }];
 }
 
-RCT_EXPORT_METHOD(verifyPhoneNumber
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)phoneNumber
-                  : (NSString *)requestKey) {
++ (void)verifyPhoneNumber:(NSString *)appName
+              phoneNumber:(NSString *)phoneNumber
+               requestKey:(NSString *)requestKey
+                  timeout:(double)timeout
+              forceResend:(BOOL)forceResend {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   DLog(@"using instance verifyPhoneNumber: %@", firebaseApp.name);
 
   [[FIRPhoneAuthProvider providerWithAuth:[FIRAuth authWithApp:firebaseApp]]
@@ -1184,11 +1393,12 @@ RCT_EXPORT_METHOD(verifyPhoneNumber
              }];
 }
 
-RCT_EXPORT_METHOD(confirmationResultConfirm
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)verificationCode
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)confirmationResultConfirm:(NSString *)appName
+                 verificationCode:(NSString *)verificationCode
+                          resolve:(RCTPromiseResolveBlock)resolve
+                           reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   NSString *verificationId = [defaults stringForKey:@"authVerificationID"];
 
@@ -1210,13 +1420,14 @@ RCT_EXPORT_METHOD(confirmationResultConfirm
 }
 #endif
 
-RCT_EXPORT_METHOD(linkWithCredential
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)provider
-                  : (NSString *)authToken
-                  : (NSString *)authSecret
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)linkWithCredential:(NSString *)appName
+                  provider:(NSString *)provider
+                 authToken:(NSString *)authToken
+                authSecret:(NSString *)authSecret
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRAuthCredential *credential = [self getCredentialForProvider:provider
                                                            token:authToken
                                                           secret:authSecret
@@ -1246,11 +1457,12 @@ RCT_EXPORT_METHOD(linkWithCredential
   }
 }
 
-RCT_EXPORT_METHOD(linkWithProvider
-                  : (FIRApp *)firebaseApp
-                  : (NSDictionary *)provider
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)linkWithProvider:(NSString *)appName
+                provider:(NSDictionary *)provider
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSString *providerId = provider[@"providerId"];
   if (providerId == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
@@ -1311,11 +1523,12 @@ RCT_EXPORT_METHOD(linkWithProvider
 #endif
 }
 
-RCT_EXPORT_METHOD(unlink
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)providerId
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)unlink:(NSString *)appName
+    providerId:(NSString *)providerId
+       resolve:(RCTPromiseResolveBlock)resolve
+        reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
 
   if (user) {
@@ -1335,13 +1548,14 @@ RCT_EXPORT_METHOD(unlink
   }
 }
 
-RCT_EXPORT_METHOD(reauthenticateWithCredential
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)provider
-                  : (NSString *)authToken
-                  : (NSString *)authSecret
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)reauthenticateWithCredential:(NSString *)appName
+                            provider:(NSString *)provider
+                           authToken:(NSString *)authToken
+                          authSecret:(NSString *)authSecret
+                             resolve:(RCTPromiseResolveBlock)resolve
+                              reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   FIRAuthCredential *credential = [self getCredentialForProvider:provider
                                                            token:authToken
                                                           secret:authSecret
@@ -1375,11 +1589,12 @@ RCT_EXPORT_METHOD(reauthenticateWithCredential
   }
 }
 
-RCT_EXPORT_METHOD(reauthenticateWithProvider
-                  : (FIRApp *)firebaseApp
-                  : (NSDictionary *)provider
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)reauthenticateWithProvider:(NSString *)appName
+                          provider:(NSDictionary *)provider
+                           resolve:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   NSString *providerId = provider[@"providerId"];
   if (providerId == nil) {
     [RNFBSharedUtils rejectPromiseWithUserInfo:reject
@@ -1440,11 +1655,12 @@ RCT_EXPORT_METHOD(reauthenticateWithProvider
 #endif
 }
 
-RCT_EXPORT_METHOD(fetchSignInMethodsForEmail
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)email
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)fetchSignInMethodsForEmail:(NSString *)appName
+                             email:(NSString *)email
+                           resolve:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       fetchSignInMethodsForEmail:email
                       completion:^(NSArray<NSString *> *_Nullable providers,
@@ -1460,7 +1676,9 @@ RCT_EXPORT_METHOD(fetchSignInMethodsForEmail
                       }];
 }
 
-RCT_EXPORT_METHOD(setLanguageCode : (FIRApp *)firebaseApp : (NSString *)code) {
++ (void)setLanguageCode:(NSString *)appName code:(NSString *)code {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if (code) {
     [FIRAuth authWithApp:firebaseApp].languageCode = code;
   } else {
@@ -1468,19 +1686,28 @@ RCT_EXPORT_METHOD(setLanguageCode : (FIRApp *)firebaseApp : (NSString *)code) {
   }
 }
 
-RCT_EXPORT_METHOD(setTenantId : (FIRApp *)firebaseApp : (NSString *)tenantID) {
-  [FIRAuth authWithApp:firebaseApp].tenantID = tenantID;
++ (void)setTenantId:(NSString *)appName
+           tenantId:(NSString *)tenantId
+            resolve:(RCTPromiseResolveBlock)resolve
+             reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
+  [FIRAuth authWithApp:firebaseApp].tenantID = tenantId;
+  resolve([NSNull null]);
 }
 
-RCT_EXPORT_METHOD(useDeviceLanguage : (FIRApp *)firebaseApp) {
++ (void)useDeviceLanguage:(NSString *)appName {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp] useAppLanguage];
 }
 
-RCT_EXPORT_METHOD(verifyPasswordResetCode
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)code
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)verifyPasswordResetCode:(NSString *)appName
+                           code:(NSString *)code
+                        resolve:(RCTPromiseResolveBlock)resolve
+                         reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   [[FIRAuth authWithApp:firebaseApp]
       verifyPasswordResetCode:code
                    completion:^(NSString *_Nullable email, NSError *_Nullable error) {
@@ -1492,20 +1719,73 @@ RCT_EXPORT_METHOD(verifyPasswordResetCode
                    }];
 }
 
-RCT_EXPORT_METHOD(useEmulator
-                  : (FIRApp *)firebaseApp
-                  : (nonnull NSString *)host
-                  : (NSInteger)port) {
++ (void)useEmulator:(NSString *)appName host:(nonnull NSString *)host port:(double)port {
+  [self initializeSharedStateOnce];
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
+
   if (!emulatorConfigs[firebaseApp.name]) {
-    [[FIRAuth authWithApp:firebaseApp] useEmulatorWithHost:host port:port];
+    [[FIRAuth authWithApp:firebaseApp] useEmulatorWithHost:host port:(NSInteger)port];
     emulatorConfigs[firebaseApp.name] = @YES;
   }
 }
 
-- (FIRAuthCredential *)getCredentialForProvider:(NSString *)provider
++ (NSString *)nonEmptyStringFromDictionary:(NSDictionary *)dictionary key:(NSString *)key {
+  id value = dictionary[key];
+  if (![value isKindOfClass:[NSString class]]) {
+    return nil;
+  }
+
+  NSString *stringValue = (NSString *)value;
+  NSString *trimmed = [stringValue
+      stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+  return trimmed.length > 0 ? stringValue : nil;
+}
+
++ (NSPersonNameComponents *)personNameComponentsFromDictionary:(NSDictionary *)dictionary {
+  if (dictionary == nil || (id)dictionary == [NSNull null]) {
+    return nil;
+  }
+
+  NSPersonNameComponents *components = [[NSPersonNameComponents alloc] init];
+  BOOL hasAnyComponent = NO;
+  NSString *namePrefix = [self nonEmptyStringFromDictionary:dictionary key:@"namePrefix"];
+  if (namePrefix != nil) {
+    components.namePrefix = namePrefix;
+    hasAnyComponent = YES;
+  }
+  NSString *givenName = [self nonEmptyStringFromDictionary:dictionary key:@"givenName"];
+  if (givenName != nil) {
+    components.givenName = givenName;
+    hasAnyComponent = YES;
+  }
+  NSString *middleName = [self nonEmptyStringFromDictionary:dictionary key:@"middleName"];
+  if (middleName != nil) {
+    components.middleName = middleName;
+    hasAnyComponent = YES;
+  }
+  NSString *familyName = [self nonEmptyStringFromDictionary:dictionary key:@"familyName"];
+  if (familyName != nil) {
+    components.familyName = familyName;
+    hasAnyComponent = YES;
+  }
+  NSString *nameSuffix = [self nonEmptyStringFromDictionary:dictionary key:@"nameSuffix"];
+  if (nameSuffix != nil) {
+    components.nameSuffix = nameSuffix;
+    hasAnyComponent = YES;
+  }
+  NSString *nickname = [self nonEmptyStringFromDictionary:dictionary key:@"nickname"];
+  if (nickname != nil) {
+    components.nickname = nickname;
+    hasAnyComponent = YES;
+  }
+  return hasAnyComponent ? components : nil;
+}
+
++ (FIRAuthCredential *)getCredentialForProvider:(NSString *)provider
                                           token:(NSString *)authToken
                                          secret:(NSString *)authTokenSecret
                                     firebaseApp:(FIRApp *)firebaseApp {
+  [self initializeSharedStateOnce];
   FIRAuthCredential *credential;
 
   // First check if we cached an authToken
@@ -1559,7 +1839,7 @@ RCT_EXPORT_METHOD(useEmulator
 
 // This is here to protect against bugs in the iOS SDK which don't
 // correctly refresh the user object when performing certain operations
-- (void)reloadAndReturnUser:(FIRUser *)user
++ (void)reloadAndReturnUser:(FIRUser *)user
                    resolver:(RCTPromiseResolveBlock)resolve
                    rejecter:(RCTPromiseRejectBlock)reject
                 firebaseApp:(FIRApp *)firebaseApp {
@@ -1572,7 +1852,7 @@ RCT_EXPORT_METHOD(useEmulator
   }];
 }
 
-- (void)promiseNoUser:(RCTPromiseResolveBlock)resolve
++ (void)promiseNoUser:(RCTPromiseResolveBlock)resolve
              rejecter:(RCTPromiseRejectBlock)reject
               isError:(BOOL)isError {
   if (isError) {
@@ -1587,7 +1867,7 @@ RCT_EXPORT_METHOD(useEmulator
 }
 
 #if TARGET_OS_IOS
-- (NSDictionary *)multiFactorResolverToDict:(FIRMultiFactorResolver *)resolver {
++ (NSDictionary *)multiFactorResolverToDict:(FIRMultiFactorResolver *)resolver {
   // Temporarily store the non-serializable session for later
   NSString *sessionHash = [NSString stringWithFormat:@"%@", @([resolver.session hash])];
 
@@ -1599,7 +1879,7 @@ RCT_EXPORT_METHOD(useEmulator
 }
 #endif
 
-- (void)promiseRejectAuthException:(RCTPromiseRejectBlock)reject error:(NSError *)error {
++ (void)promiseRejectAuthException:(RCTPromiseRejectBlock)reject error:(NSError *)error {
   NSDictionary *jsError = [self getJSError:error];
 
   [RNFBSharedUtils
@@ -1613,7 +1893,8 @@ RCT_EXPORT_METHOD(useEmulator
                        }];
 }
 
-- (NSDictionary *)getJSError:(NSError *)error {
++ (NSDictionary *)getJSError:(NSError *)error {
+  [self initializeSharedStateOnce];
   NSString *code = AuthErrorCode_toJSErrorCode[error.code];
   NSString *message = [error localizedDescription];
   NSString *nativeErrorMessage = [error localizedDescription];
@@ -1718,7 +1999,7 @@ RCT_EXPORT_METHOD(useEmulator
   };
 }
 
-- (void)promiseWithUser:(RCTPromiseResolveBlock)resolve
++ (void)promiseWithUser:(RCTPromiseResolveBlock)resolve
                rejecter:(RCTPromiseRejectBlock)reject
                    user:(FIRUser *)user {
   if (user) {
@@ -1729,7 +2010,7 @@ RCT_EXPORT_METHOD(useEmulator
   }
 }
 
-- (void)promiseWithAuthResult:(RCTPromiseResolveBlock)resolve
++ (void)promiseWithAuthResult:(RCTPromiseResolveBlock)resolve
                      rejecter:(RCTPromiseRejectBlock)reject
                    authResult:(FIRAuthDataResult *)authResult {
   if (authResult && authResult.user) {
@@ -1770,7 +2051,7 @@ RCT_EXPORT_METHOD(useEmulator
   }
 }
 
-- (NSArray<NSObject *> *)convertProviderData:(NSArray<id<FIRUserInfo>> *)providerData {
++ (NSArray<NSObject *> *)convertProviderData:(NSArray<id<FIRUserInfo>> *)providerData {
   NSMutableArray *output = [NSMutableArray array];
 
   for (id<FIRUserInfo> userInfo in providerData) {
@@ -1806,7 +2087,7 @@ RCT_EXPORT_METHOD(useEmulator
   return output;
 }
 
-- (NSDictionary *)constantsToExport {
++ (NSDictionary *)authConstantsDictionary {
   NSDictionary *firebaseApps = [FIRApp allApps];
   NSMutableDictionary *constants = [NSMutableDictionary new];
   NSMutableDictionary *appLanguage = [NSMutableDictionary new];
@@ -1833,7 +2114,7 @@ RCT_EXPORT_METHOD(useEmulator
   return constants;
 }
 
-- (NSDictionary *)firebaseUserToDict:(FIRUser *)user {
++ (NSDictionary *)firebaseUserToDict:(FIRUser *)user {
   return @{
     keyDisplayName : user.displayName ? (id)user.displayName : [NSNull null],
     keyEmail : user.email ? (id)user.email : [NSNull null],
@@ -1862,7 +2143,7 @@ RCT_EXPORT_METHOD(useEmulator
 }
 
 #if TARGET_OS_IOS
-- (NSArray<NSMutableDictionary *> *)convertMultiFactorData:(NSArray<FIRMultiFactorInfo *> *)hints {
++ (NSArray<NSMutableDictionary *> *)convertMultiFactorData:(NSArray<FIRMultiFactorInfo *> *)hints {
   NSMutableArray *enrolledFactors = [NSMutableArray array];
 
   for (FIRMultiFactorInfo *hint in hints) {
@@ -1889,7 +2170,8 @@ RCT_EXPORT_METHOD(useEmulator
 }
 #endif
 
-- (NSDictionary *)authCredentialToDict:(FIRAuthCredential *)authCredential {
++ (NSDictionary *)authCredentialToDict:(FIRAuthCredential *)authCredential {
+  [self initializeSharedStateOnce];
   NSString *authCredentialHash = [NSString stringWithFormat:@"%@", @([authCredential hash])];
 
   // Temporarily store the non-serializable credential for later
@@ -1902,7 +2184,7 @@ RCT_EXPORT_METHOD(useEmulator
   };
 }
 
-- (FIRActionCodeSettings *)buildActionCodeSettings:(NSDictionary *)actionCodeSettings {
++ (FIRActionCodeSettings *)buildActionCodeSettings:(NSDictionary *)actionCodeSettings {
   FIRActionCodeSettings *settings = [[FIRActionCodeSettings alloc] init];
 
   NSString *url = actionCodeSettings[keyUrl];