[Auth] NFC - AuthRecaptchaVerifier.swift

FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift

@@ -71,8 +71,10 @@
  private(set) weak var auth: Auth?
  private(set) var agentConfig: AuthRecaptchaConfig?
  private(set) var tenantConfigs: [String: AuthRecaptchaConfig] = [:]
+ // Only initialized once. Recpatcha SDK does not support multiple clients.
  private(set) var recaptchaClient: RCARecaptchaClientProtocol?
  private static var _shared = AuthRecaptchaVerifier()
+
  private let kRecaptchaVersion = "RECAPTCHA_ENTERPRISE"
  init() {}
 
@@ -91,16 +93,6 @@
  _ = shared(auth: auth)
  }
 
- func siteKey() -> String? {
- if let tenantID = auth?.tenantID {
- if let config = tenantConfigs[tenantID] {
- return config.siteKey
- }
- return nil
- }
- return agentConfig?.siteKey
- }
-
  func enablementStatus(forProvider provider: AuthRecaptchaProvider)
  -> AuthRecaptchaEnablementStatus {
  if let tenantID = auth?.tenantID,
@@ -154,7 +146,48 @@
  #endif // !(COCOAPODS || SWIFT_PACKAGE)
  }
 
- private static var recaptchaClient: (any RCARecaptchaClientProtocol)?
+ func retrieveRecaptchaConfig(forceRefresh: Bool) async throws {
+ if !forceRefresh {
+ if let tenantID = auth?.tenantID {
+ if tenantConfigs[tenantID] != nil {
+ return
+ }
+ } else if agentConfig != nil {
+ return
+ }
+ }
+
+ guard let auth = auth else {
+ throw AuthErrorUtils.error(code: .recaptchaNotEnabled,
+ message: "No requestConfiguration for Auth instance")
+ }
+ let request = GetRecaptchaConfigRequest(requestConfiguration: auth.requestConfiguration)
+ let response = try await auth.backend.call(with: request)
+ AuthLog.logInfo(code: "I-AUT000029", message: "reCAPTCHA config retrieval succeeded.")
+ try await parseRecaptchaConfigFromResponse(response: response)
+ }
+
+ private func siteKey() -> String? {
+ if let tenantID = auth?.tenantID {
+ if let config = tenantConfigs[tenantID] {
+ return config.siteKey
+ }
+ return nil
+ }
+ return agentConfig?.siteKey
+ }
+
+ func injectRecaptchaFields(request: any AuthRPCRequest,
+ provider: AuthRecaptchaProvider,
+ action: AuthRecaptchaAction) async throws {
+ try await retrieveRecaptchaConfig(forceRefresh: false)
+ if enablementStatus(forProvider: provider) != .off {
+ let token = try await verify(forceRefresh: false, action: action)
+ request.injectRecaptchaFields(recaptchaResponse: token, recaptchaVersion: kRecaptchaVersion)
+ } else {
+ request.injectRecaptchaFields(recaptchaResponse: nil, recaptchaVersion: kRecaptchaVersion)
+ }
+ }
 
  #if COCOAPODS || SWIFT_PACKAGE // No recaptcha on internal build system.
  private func recaptchaToken(siteKey: String,
@@ -206,28 +239,7 @@
  }
  }
 
- func retrieveRecaptchaConfig(forceRefresh: Bool) async throws {
- if !forceRefresh {
- if let tenantID = auth?.tenantID {
- if tenantConfigs[tenantID] != nil {
- return
- }
- } else if agentConfig != nil {
- return
- }
- }
-
- guard let auth = auth else {
- throw AuthErrorUtils.error(code: .recaptchaNotEnabled,
- message: "No requestConfiguration for Auth instance")
- }
- let request = GetRecaptchaConfigRequest(requestConfiguration: auth.requestConfiguration)
- let response = try await auth.backend.call(with: request)
- AuthLog.logInfo(code: "I-AUT000029", message: "reCAPTCHA config retrieval succeeded.")
- try await parseRecaptchaConfigFromResponse(response: response)
- }
-
- func parseRecaptchaConfigFromResponse(response: GetRecaptchaConfigResponse) async throws {
+ private func parseRecaptchaConfigFromResponse(response: GetRecaptchaConfigResponse) async throws {
  var enablementStatus: [AuthRecaptchaProvider: AuthRecaptchaEnablementStatus] = [:]
  var isRecaptchaEnabled = false
  if let enforcementState = response.enforcementState {
@@ -263,17 +275,5 @@
  agentConfig = config
  }
  }
-
- func injectRecaptchaFields(request: any AuthRPCRequest,
- provider: AuthRecaptchaProvider,
- action: AuthRecaptchaAction) async throws {
- try await retrieveRecaptchaConfig(forceRefresh: false)
- if enablementStatus(forProvider: provider) != .off {
- let token = try await verify(forceRefresh: false, action: action)
- request.injectRecaptchaFields(recaptchaResponse: token, recaptchaVersion: kRecaptchaVersion)
- } else {
- request.injectRecaptchaFields(recaptchaResponse: nil, recaptchaVersion: kRecaptchaVersion)
- }
- }
  }
 #endif