refactor: remove GoogleServiceError

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -36,7 +36,6 @@ public enum AuthServiceError: LocalizedError {
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
   case accountMergeConflict(context: AccountMergeConflictContext)
-  case invalidPhoneAuthenticationArguments(String)
   case providerNotFound(String)
   case multiFactorAuth(String)
 
@@ -54,16 +53,20 @@ public enum AuthServiceError: LocalizedError {
       return description
     case let .invalidCredentials(description):
       return description
+    // Use when failed to sign-in with Firebase
     case let .signInFailed(underlying: error):
       return "Failed to sign in: \(error.localizedDescription)"
+    // Use when failed to sign-in with provider (e.g. Google, Facebook, etc.)
+    case let .providerAuthenticationFailed(description):
+      return description
     case let .accountMergeConflict(context):
       return context.errorDescription
     case let .providerNotFound(description):
       return description
-    case let .invalidPhoneAuthenticationArguments(description):
-      return description
     case let .multiFactorAuth(description):
       return description
+    case let .rootViewControllerNotFound(description):
+      return description
     }
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -19,12 +19,6 @@ import GoogleSignIn
 import GoogleSignInSwift
 import SwiftUI
 
-public enum GoogleProviderError: Error {
-  case rootViewControllerNotFound(String)
-  case authenticationToken(String)
-  case user(String)
-}
-
 public class GoogleProviderSwift: AuthProviderSwift, DeleteUserSwift {
   let scopes: [String]
   let clientID: String
@@ -42,7 +36,7 @@ public class GoogleProviderSwift: AuthProviderSwift, DeleteUserSwift {
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
     guard let presentingViewController = await (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {
-      throw GoogleProviderError
+      throw AuthServiceError
         .rootViewControllerNotFound(
           "Root View controller is not available to present Google sign-in View."
         )
@@ -63,7 +57,8 @@ public class GoogleProviderSwift: AuthProviderSwift, DeleteUserSwift {
         guard let user = result?.user,
               let idToken = user.idToken?.tokenString else {
           continuation
-            .resume(throwing: GoogleProviderError.user("Failed to retrieve user or idToken."))
+            .resume(throwing: AuthServiceError
+              .providerAuthenticationFailed("Failed to retrieve user or idToken."))
           return
         }
 

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -39,7 +39,7 @@ public class PhoneProviderSwift: PhoneAuthProviderSwift {
     guard let presentingViewController = await (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {
       throw AuthServiceError
-        .invalidPhoneAuthenticationArguments(
+        .rootViewControllerNotFound(
           "Root View controller is not available to present Phone auth View."
         )
     }