more refactoring

Author: ncooke3

FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift

@@ -69,41 +69,12 @@ enum AuthRecaptchaAction: String {
 
 @available(iOS 13, *)
 class AuthRecaptchaVerifier {
+  private let recaptchaVersion = "RECAPTCHA_ENTERPRISE"
   weak var auth: Auth?
   private var agentConfig: AuthRecaptchaConfig?
   private var tenantConfigs: [String: AuthRecaptchaConfig] = [:]
   #if os(iOS)
     private var recaptchaClient: RCARecaptchaClientProtocol?
-  #endif // os(iOS)
-  private let recaptchaVersion = "RECAPTCHA_ENTERPRISE"
-}
-
-#if os(iOS)
-  @available(iOS 13, *)
-  extension AuthRecaptchaVerifier {
-    private 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,
-         let tenantConfig = tenantConfigs[tenantID],
-         let status = tenantConfig.enablementStatus[provider] {
-        return status
-      } else if let agentConfig = agentConfig,
-                let status = agentConfig.enablementStatus[provider] {
-        return status
-      } else {
-        return AuthRecaptchaEnablementStatus.off
-      }
-    }
 
     func verify(forceRefresh: Bool, action: AuthRecaptchaAction) async throws -> String {
       try await retrieveRecaptchaConfig(forceRefresh: forceRefresh)
@@ -143,6 +114,30 @@ class AuthRecaptchaVerifier {
       #endif // !(COCOAPODS || SWIFT_PACKAGE)
     }
 
+    private 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,
+         let tenantConfig = tenantConfigs[tenantID],
+         let status = tenantConfig.enablementStatus[provider] {
+        return status
+      } else if let agentConfig = agentConfig,
+                let status = agentConfig.enablementStatus[provider] {
+        return status
+      } else {
+        return AuthRecaptchaEnablementStatus.off
+      }
+    }
+
     private func recaptchaToken(siteKey: String,
                                 actionString: String,
                                 fakeToken: String) async -> (token: String, error: Error?,
@@ -262,5 +257,5 @@ class AuthRecaptchaVerifier {
         request.injectRecaptchaFields(recaptchaResponse: nil, recaptchaVersion: recaptchaVersion)
       }
     }
-  }
-#endif // os(iOS)
+  #endif // os(iOS)
+}