firebase · paulb777 · Oct 10, 2023 · Oct 10, 2023
diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift
@@ -297,7 +297,7 @@ extension Auth: AuthInterop {
                                          requestConfiguration: self.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           Auth.wrapMainAsync(callback: completion, withParam: response.signinMethods, error: nil)
         } catch {
           Auth.wrapMainAsync(callback: completion, withParam: nil, error: error)
@@ -386,7 +386,7 @@ extension Auth: AuthInterop {
     if request.password.count == 0 {
       throw AuthErrorUtils.wrongPasswordError(message: nil)
     }
-    let response = try await AuthBackend.post(with: request)
+    let response = try await AuthBackend.call(with: request)
     return try await completeSignIn(withAccessToken: response.idToken,
                                     accessTokenExpirationDate: response
                                       .approximateExpirationDate,
@@ -766,7 +766,7 @@ extension Auth: AuthInterop {
       let request = SignUpNewUserRequest(requestConfiguration: self.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           let user = try await self.completeSignIn(
             withAccessToken: response.idToken,
             accessTokenExpirationDate: response.approximateExpirationDate,
@@ -838,7 +838,7 @@ extension Auth: AuthInterop {
                                              requestConfiguration: self.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           let user = try await self.completeSignIn(
             withAccessToken: response.idToken,
             accessTokenExpirationDate: response.approximateExpirationDate,
@@ -934,7 +934,7 @@ extension Auth: AuthInterop {
                                          requestConfiguration: self.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           let user = try await self.completeSignIn(
             withAccessToken: response.idToken,
             accessTokenExpirationDate: response.approximateExpirationDate,
@@ -1066,7 +1066,7 @@ extension Auth: AuthInterop {
                                          requestConfiguration: self.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
 
           let operation = ActionCodeInfo.actionCodeOperation(forRequestType: response.requestType)
           guard let email = response.email else {
@@ -2113,7 +2113,7 @@ extension Auth: AuthInterop {
                                          requestConfiguration: requestConfiguration)
     request.autoCreate = !isReauthentication
     credential.prepare(request)
-    let response = try await AuthBackend.post(with: request)
+    let response = try await AuthBackend.call(with: request)
     if response.needConfirmation {
       let email = response.email
       let credential = OAuthCredential(withVerifyAssertionResponse: response)
@@ -2156,7 +2156,7 @@ extension Auth: AuthInterop {
                                                phoneNumber: phoneNumber,
                                                operation: operation,
                                                requestConfiguration: requestConfiguration)
-        return try await AuthBackend.post(with: request)
+        return try await AuthBackend.call(with: request)
       case let .verification(verificationID, code):
         guard verificationID.count > 0 else {
           throw AuthErrorUtils.missingVerificationIDError(message: nil)
@@ -2168,7 +2168,7 @@ extension Auth: AuthInterop {
                                                verificationCode: code,
                                                operation: operation,
                                                requestConfiguration: requestConfiguration)
-        return try await AuthBackend.post(with: request)
+        return try await AuthBackend.call(with: request)
       }
     }
   #endif
@@ -2198,7 +2198,7 @@ extension Auth: AuthInterop {
                                                 timestamp: credential.timestamp,
                                                 displayName: credential.displayName,
                                                 requestConfiguration: requestConfiguration)
-      let response = try await AuthBackend.post(with: request)
+      let response = try await AuthBackend.call(with: request)
       let user = try await completeSignIn(withAccessToken: response.idToken,
                                           accessTokenExpirationDate: response
                                             .approximateExpirationDate,
@@ -2234,7 +2234,7 @@ extension Auth: AuthInterop {
     let request = EmailLinkSignInRequest(email: email,
                                          oobCode: actionCode,
                                          requestConfiguration: requestConfiguration)
-    let response = try await AuthBackend.post(with: request)
+    let response = try await AuthBackend.call(with: request)
     let user = try await completeSignIn(withAccessToken: response.idToken,
                                         accessTokenExpirationDate: response
                                           .approximateExpirationDate,
@@ -2293,7 +2293,7 @@ extension Auth: AuthInterop {
   private func wrapAsyncRPCTask(_ request: any AuthRPCRequest, _ callback: ((Error?) -> Void)?) {
     Task {
       do {
-        let _ = try await AuthBackend.post(with: request)
+        let _ = try await AuthBackend.call(with: request)
         Auth.wrapMainAsync(callback, nil)
       } catch {
         Auth.wrapMainAsync(callback, error)

diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift
@@ -217,7 +217,7 @@ import FirebaseCore
                                                   .requestConfiguration)
 
       do {
-        let response = try await AuthBackend.post(with: request)
+        let response = try await AuthBackend.call(with: request)
         return response.verificationID
       } catch {
         return try await handleVerifyErrorWithRetry(error: error,
@@ -249,7 +249,7 @@ import FirebaseCore
           requestConfiguration: auth.requestConfiguration
         )
 
-        let response = try await AuthBackend.post(with: request)
+        let response = try await AuthBackend.call(with: request)
         return response.verificationID
       }
       guard let session else {
@@ -268,15 +268,15 @@ import FirebaseCore
           let request = StartMFAEnrollmentRequest(idToken: session.idToken,
                                                   enrollmentInfo: startMFARequestInfo,
                                                   requestConfiguration: auth.requestConfiguration)
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           return response.phoneSessionInfo?.sessionInfo
         case .recaptcha:
           let request = StartMFASignInRequest(MFAPendingCredential: session.mfaPendingCredential,
                                               MFAEnrollmentID: session.multiFactorInfo?.uid,
                                               signInInfo: startMFARequestInfo,
                                               requestConfiguration: auth.requestConfiguration)
 
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           return response.responseInfo?.sessionInfo
         case .empty:
           return nil
@@ -338,7 +338,7 @@ import FirebaseCore
                                         isSandbox: token.type == AuthAPNSTokenType.sandbox,
                                         requestConfiguration: auth.requestConfiguration)
       do {
-        let verifyResponse = try await AuthBackend.post(with: request)
+        let verifyResponse = try await AuthBackend.call(with: request)
         guard let receipt = verifyResponse.receipt,
               let timeout = verifyResponse.suggestedTimeOutDate?.timeIntervalSinceNow else {
           fatalError("Internal Auth Error: invalid VerifyClientResponse")

diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift
@@ -25,15 +25,15 @@ import FirebaseCoreInternal
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 protocol AuthBackendRPCIssuer: NSObjectProtocol {
   /** @fn
-      @brief Asynchronously sends a POST request.
+      @brief Asynchronously sends a HTTP request.
       @param requestConfiguration The request to be made.
       @param URL The request URL.
       @param body Request body.
       @param contentType Content type of the body.
-      @param handler provided that handles POST response. Invoked asynchronously on the auth global
+      @param handler provided that handles HTTP response. Invoked asynchronously on the auth global
           work queue in the future.
    */
-  func asyncPostToURL<T: AuthRPCRequest>(with request: T,
+  func asyncCallToURL<T: AuthRPCRequest>(with request: T,
                                          body: Data?,
                                          contentType: String,
                                          completionHandler: @escaping ((Data?, Error?) -> Void))
@@ -53,7 +53,7 @@ class AuthBackendRPCIssuerImplementation: NSObject, AuthBackendRPCIssuer {
     fetcherService.reuseSession = false
   }
 
-  func asyncPostToURL<T: AuthRPCRequest>(with request: T,
+  func asyncCallToURL<T: AuthRPCRequest>(with request: T,
                                          body: Data?,
                                          contentType: String,
                                          completionHandler: @escaping ((Data?, Error?)
@@ -96,8 +96,8 @@ class AuthBackend: NSObject {
     return gBackendImplementation!
   }
 
-  class func post<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
-    return try await implementation().post(with: request)
+  class func call<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
+    return try await implementation().call(with: request)
   }
 
   class func request(withURL url: URL,
@@ -147,7 +147,7 @@ class AuthBackend: NSObject {
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 protocol AuthBackendImplementation {
-  func post<T: AuthRPCRequest>(with request: T) async throws -> T.Response
+  func call<T: AuthRPCRequest>(with request: T) async throws -> T.Response
 }
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
@@ -157,8 +157,8 @@ private class AuthBackendRPCImplementation: NSObject, AuthBackendImplementation
     rpcIssuer = AuthBackendRPCIssuerImplementation()
   }
 
-  /** @fn postWithRequest:
-      @brief Calls the RPC using HTTP POST.
+  /** @fn call
+      @brief Calls the RPC using HTTP request.
       @remarks Possible error responses:
           @see FIRAuthInternalErrorCodeRPCRequestEncodingError
           @see FIRAuthInternalErrorCodeJSONSerializationError
@@ -170,8 +170,8 @@ private class AuthBackendRPCImplementation: NSObject, AuthBackendImplementation
       @param response The empty response to be filled.
       @param callback The callback for both success and failure.
    */
-  fileprivate func post<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
-    let response = try await postInternal(with: request)
+  fileprivate func call<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
+    let response = try await callInternal(with: request)
     if let auth = request.requestConfiguration().auth,
        let mfaError = Self.generateMFAError(response: response, auth: auth) {
       throw mfaError
@@ -240,8 +240,8 @@ private class AuthBackendRPCImplementation: NSObject, AuthBackendImplementation
     }
   #endif
 
-  /** @fn postWithRequest:response:
-      @brief Calls the RPC using HTTP POST.
+  /** @fn call
+      @brief Calls the RPC using HTTP request.
       @remarks Possible error responses:
           @see FIRAuthInternalErrorCodeRPCRequestEncodingError
           @see FIRAuthInternalErrorCodeJSONSerializationError
@@ -253,7 +253,7 @@ private class AuthBackendRPCImplementation: NSObject, AuthBackendImplementation
       @param response The empty response to be filled.
       @param callback The callback for both success and failure.
    */
-  fileprivate func postInternal<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
+  fileprivate func callInternal<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
     var bodyData: Data?
     if request.containsPostBody {
       var postBody: [String: AnyHashable]
@@ -288,7 +288,7 @@ private class AuthBackendRPCImplementation: NSObject, AuthBackendImplementation
     }
     return try await withCheckedThrowingContinuation { continuation in
       rpcIssuer
-        .asyncPostToURL(with: request, body: bodyData, contentType: "application/json") {
+        .asyncCallToURL(with: request, body: bodyData, contentType: "application/json") {
           data, error in
           // If there is an error with no body data at all, then this must be a
           // network error.

diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift
@@ -88,7 +88,7 @@ import Foundation
                                                        .requestConfiguration)
           Task {
             do {
-              let response = try await AuthBackend.post(with: request)
+              let response = try await AuthBackend.call(with: request)
               do {
                 let user = try await auth.completeSignIn(withAccessToken: response.idToken,
                                                          accessTokenExpirationDate: nil,
@@ -138,7 +138,7 @@ import Foundation
 
         Task {
           do {
-            let response = try await AuthBackend.post(with: request)
+            let response = try await AuthBackend.call(with: request)
             do {
               let user = try await auth.completeSignIn(withAccessToken: response.idToken,
                                                        accessTokenExpirationDate: nil,
@@ -222,7 +222,7 @@ import Foundation
                                        requestConfiguration: user.requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           do {
             let user = try await auth.completeSignIn(withAccessToken: response.idToken,
                                                      accessTokenExpirationDate: nil,

diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift
@@ -80,7 +80,7 @@ import Foundation
       )
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           let user = try await self.auth.completeSignIn(withAccessToken: response.idToken,
                                                         accessTokenExpirationDate: nil,
                                                         refreshToken: response.refreshToken,

diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift b/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift
@@ -49,7 +49,7 @@ import Foundation
                                               requestConfiguration: requestConfiguration)
       Task {
         do {
-          let response = try await AuthBackend.post(with: request)
+          let response = try await AuthBackend.call(with: request)
           if let totpSessionInfo = response.totpSessionInfo {
             let secret = TOTPSecret(secretKey: totpSessionInfo.sharedSecretKey,
                                     hashingAlgorithm: totpSessionInfo.hashingAlgorithm,

diff --git a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift
@@ -167,7 +167,7 @@ private let kFiveMinutes = 5 * 60.0
 
     let request = SecureTokenRequest.refreshRequest(refreshToken: refreshToken,
                                                     requestConfiguration: requestConfiguration)
-    let response = try await AuthBackend.post(with: request)
+    let response = try await AuthBackend.call(with: request)
     var tokenUpdated = false
     if let newAccessToken = response.accessToken,
        newAccessToken.count > 0,

diff --git a/FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift b/FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift
@@ -65,7 +65,7 @@ import Foundation
     }
     self.providerID = providerID
     profile = aDecoder.decodeObject(
-      of: NSDictionary.self,
+      of: [NSDictionary.self, NSString.self],
       forKey: AdditionalUserInfo.profileCodingKey
     ) as? [String: Any]
     username = aDecoder.decodeObject(