[Auth] Swift 6 improvesments for RecaptchaVerifier

Author: ncooke3

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -1297,6 +1297,8 @@ extension Auth: AuthInterop {
     return false
   }
 
+  let recaptchaVerifier: AuthRecaptchaVerifier
+
   #if os(iOS) && !targetEnvironment(macCatalyst)
 
     /// Initializes reCAPTCHA using the settings configured for the project or tenant.
@@ -1326,8 +1328,10 @@ extension Auth: AuthInterop {
     open func initializeRecaptchaConfig() async throws {
       // Trigger recaptcha verification flow to initialize the recaptcha client and
       // config. Recaptcha token will be returned.
-      let verifier = AuthRecaptchaVerifier.shared(auth: self)
-      _ = try await verifier.verify(forceRefresh: true, action: AuthRecaptchaAction.defaultAction)
+      _ = try await recaptchaVerifier.verify(
+        forceRefresh: true,
+        action: AuthRecaptchaAction.defaultAction
+      )
     }
   #endif
 
@@ -1627,7 +1631,8 @@ extension Auth: AuthInterop {
   init(app: FirebaseApp,
        keychainStorageProvider: AuthKeychainStorage = AuthKeychainStorageReal(),
        backend: AuthBackend = .init(rpcIssuer: AuthBackendRPCIssuer()),
-       authDispatcher: AuthDispatcher = .init()) {
+       authDispatcher: AuthDispatcher = .init(),
+       recaptchaVerifier: AuthRecaptchaVerifier = .init()) {
     self.app = app
     mainBundleUrlTypes = Bundle.main
       .object(forInfoDictionaryKey: "CFBundleURLTypes") as? [[String: Any]]
@@ -1653,6 +1658,7 @@ extension Auth: AuthInterop {
                                                     appCheck: appCheck)
     self.backend = backend
     self.authDispatcher = authDispatcher
+    self.recaptchaVerifier = recaptchaVerifier
 
     let keychainServiceName = Auth.keychainServiceName(for: app)
     keychainServices = AuthKeychainServices(service: keychainServiceName,
@@ -1664,6 +1670,7 @@ extension Auth: AuthInterop {
 
     super.init()
     requestConfiguration.auth = self
+    self.recaptchaVerifier.auth = self
 
     protectedDataInitialization()
   }
@@ -2307,7 +2314,6 @@ extension Auth: AuthInterop {
     func injectRecaptcha<T: AuthRPCRequest>(request: T,
                                             action: AuthRecaptchaAction) async throws -> T
       .Response {
-      let recaptchaVerifier = AuthRecaptchaVerifier.shared(auth: self)
       if recaptchaVerifier.enablementStatus(forProvider: AuthRecaptchaProvider.password) != .off {
         try await recaptchaVerifier.injectRecaptchaFields(request: request,
                                                           provider: AuthRecaptchaProvider.password,

FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

@@ -218,9 +218,9 @@ import Foundation
         )
       }
 
-      try await recaptchaVerifier.retrieveRecaptchaConfig(forceRefresh: true)
+      try await auth.recaptchaVerifier.retrieveRecaptchaConfig(forceRefresh: true)
 
-      switch recaptchaVerifier.enablementStatus(forProvider: .phone) {
+      switch auth.recaptchaVerifier.enablementStatus(forProvider: .phone) {
       case .off:
         return try await verifyClAndSendVerificationCode(
           toPhoneNumber: phoneNumber,
@@ -233,31 +233,28 @@ import Foundation
           toPhoneNumber: phoneNumber,
           retryOnInvalidAppCredential: true,
           multiFactorSession: multiFactorSession,
-          uiDelegate: uiDelegate,
-          recaptchaVerifier: recaptchaVerifier
+          uiDelegate: uiDelegate
         )
       case .enforce:
         return try await verifyClAndSendVerificationCodeWithRecaptcha(
           toPhoneNumber: phoneNumber,
           retryOnInvalidAppCredential: false,
           multiFactorSession: multiFactorSession,
-          uiDelegate: uiDelegate,
-          recaptchaVerifier: recaptchaVerifier
+          uiDelegate: uiDelegate
         )
       }
     }
 
     func verifyClAndSendVerificationCodeWithRecaptcha(toPhoneNumber phoneNumber: String,
                                                       retryOnInvalidAppCredential: Bool,
-                                                      uiDelegate: AuthUIDelegate?,
-                                                      recaptchaVerifier: AuthRecaptchaVerifier) async throws
+                                                      uiDelegate: AuthUIDelegate?) async throws
       -> String? {
       let request = SendVerificationCodeRequest(phoneNumber: phoneNumber,
                                                 codeIdentity: CodeIdentity.empty,
                                                 requestConfiguration: auth
                                                   .requestConfiguration)
       do {
-        try await recaptchaVerifier.injectRecaptchaFields(
+        try await auth.recaptchaVerifier.injectRecaptchaFields(
           request: request,
           provider: .phone,
           action: .sendVerificationCode
@@ -319,8 +316,7 @@ import Foundation
     private func verifyClAndSendVerificationCodeWithRecaptcha(toPhoneNumber phoneNumber: String,
                                                               retryOnInvalidAppCredential: Bool,
                                                               multiFactorSession session: MultiFactorSession?,
-                                                              uiDelegate: AuthUIDelegate?,
-                                                              recaptchaVerifier: AuthRecaptchaVerifier) async throws
+                                                              uiDelegate: AuthUIDelegate?) async throws
       -> String? {
       if let settings = auth.settings,
          settings.isAppVerificationDisabledForTesting {
@@ -336,8 +332,7 @@ import Foundation
         return try await verifyClAndSendVerificationCodeWithRecaptcha(
           toPhoneNumber: phoneNumber,
           retryOnInvalidAppCredential: retryOnInvalidAppCredential,
-          uiDelegate: uiDelegate,
-          recaptchaVerifier: recaptchaVerifier
+          uiDelegate: uiDelegate
         )
       }
       let startMFARequestInfo = AuthProtoStartMFAPhoneRequestInfo(phoneNumber: phoneNumber,
@@ -347,7 +342,7 @@ import Foundation
           let request = StartMFAEnrollmentRequest(idToken: idToken,
                                                   enrollmentInfo: startMFARequestInfo,
                                                   requestConfiguration: auth.requestConfiguration)
-          try await recaptchaVerifier.injectRecaptchaFields(
+          try await auth.recaptchaVerifier.injectRecaptchaFields(
             request: request,
             provider: .phone,
             action: .mfaSmsEnrollment
@@ -359,7 +354,7 @@ import Foundation
                                               MFAEnrollmentID: session.multiFactorInfo?.uid,
                                               signInInfo: startMFARequestInfo,
                                               requestConfiguration: auth.requestConfiguration)
-          try await recaptchaVerifier.injectRecaptchaFields(
+          try await auth.recaptchaVerifier.injectRecaptchaFields(
             request: request,
             provider: .phone,
             action: .mfaSmsSignIn
@@ -641,7 +636,6 @@ import Foundation
     private let auth: Auth
     private let callbackScheme: String
     private let usingClientIDScheme: Bool
-    private var recaptchaVerifier: AuthRecaptchaVerifier?
 
     init(auth: Auth) {
       self.auth = auth
@@ -662,7 +656,6 @@ import Foundation
         return
       }
       callbackScheme = ""
-      recaptchaVerifier = AuthRecaptchaVerifier.shared(auth: auth)
     }
 
     private let kAuthTypeVerifyApp = "verifyApp"