add/remove rebasing changes

Author: pragatimodi

FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift

@@ -207,10 +207,6 @@ class AuthErrorUtils: NSObject {
     error(code: .invalidRecaptchaToken, message: message)
   }
 
-  static func invalidRecaptchaTokenError(message: String?) -> Error {
-    error(code: .invalidRecaptchaToken, message: message)
-  }
-
   static func unauthorizedDomainError(message: String?) -> Error {
     error(code: .unauthorizedDomain, message: message)
   }

FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift

@@ -72,7 +72,7 @@
     private(set) var agentConfig: AuthRecaptchaConfig?
     private(set) var tenantConfigs: [String: AuthRecaptchaConfig] = [:]
     private(set) var recaptchaClient: RCARecaptchaClientProtocol?
-    private static var _shared: AuthRecaptchaVerifier = .init()
+    private static var _shared = AuthRecaptchaVerifier()
     private let kRecaptchaVersion = "RECAPTCHA_ENTERPRISE"
     init() {}
 

FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift

@@ -109,14 +109,12 @@
       let provider = PhoneAuthProvider.provider(auth: auth)
       let mockVerifier = FakeAuthRecaptchaVerifier(captchaResponse: kCaptchaResponse)
       AuthRecaptchaVerifier.setShared(mockVerifier, auth: auth)
-      let requestExpectation = expectation(description: "verifyRequester")
-      rpcIssuer.rceMode = .enforce
+      rpcIssuer.rceMode = "ENFORCE"
       rpcIssuer?.verifyRequester = { request in
         XCTAssertEqual(request.phoneNumber, self.kTestPhoneNumber)
         XCTAssertEqual(request.captchaResponse, self.kCaptchaResponse)
         XCTAssertEqual(request.recaptchaVersion, "RECAPTCHA_ENTERPRISE")
         XCTAssertEqual(request.codeIdentity, CodeIdentity.empty)
-        requestExpectation.fulfill()
         do {
           try self.rpcIssuer?
             .respond(withJSON: [self.kVerificationIDKey: self.kTestVerificationID])
@@ -150,9 +148,9 @@
         .invalidRecaptchaTokenError(message: "INVALID_RECAPTCHA_TOKEN")
       let mockVerifier = FakeAuthRecaptchaVerifier(error: invalidRecaptchaTokenError)
       AuthRecaptchaVerifier.setShared(mockVerifier, auth: auth)
-      rpcIssuer.rceMode = .enforce
+      rpcIssuer.rceMode = "ENFORCE"
       do {
-        let result = try await provider.verifyClAndSendVerificationCodeWithRecaptcha(
+        let _ = try await provider.verifyClAndSendVerificationCodeWithRecaptcha(
           toPhoneNumber: kTestPhoneNumber,
           retryOnInvalidAppCredential: false,
           uiDelegate: nil,
@@ -176,9 +174,9 @@
         .missingRecaptchaTokenError(message: "MISSING_RECAPTCHA_TOKEN")
       let mockVerifier = FakeAuthRecaptchaVerifier(error: missingRecaptchaTokenError)
       AuthRecaptchaVerifier.setShared(mockVerifier, auth: auth)
-      rpcIssuer.rceMode = .enforce
+      rpcIssuer.rceMode = "ENFORCE"
       do {
-        let result = try await provider.verifyClAndSendVerificationCodeWithRecaptcha(
+        let _ = try await provider.verifyClAndSendVerificationCodeWithRecaptcha(
           toPhoneNumber: kTestPhoneNumber,
           retryOnInvalidAppCredential: false,
           uiDelegate: nil,