refactor: google provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift

@@ -41,8 +41,7 @@ extension GoogleOperationReauthentication {
     }
 
     do {
-      let credential = try await googleProvider
-        .signInWithGoogle(clientID: googleProvider.clientID)
+      let credential = try await googleProvider.createAuthCredential()
       try await user.reauthenticate(with: credential)
 
       return .firebase("")

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -44,7 +44,6 @@ public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUser
   }
 
   @MainActor public func authButton() -> AnyView {
-    // Moved to SignInWithGoogleButton so we could sign in via AuthService
     AnyView(SignInWithGoogleButton())
   }
 
@@ -54,10 +53,6 @@ public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUser
   }
 
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
-    return try await signInWithGoogle(clientID: clientID)
-  }
-
-  @MainActor public func signInWithGoogle(clientID: String) async throws -> AuthCredential {
     guard let presentingViewController = await (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {
       throw GoogleProviderError
@@ -66,7 +61,7 @@ public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUser
         )
     }
 
-    let config = GIDConfiguration(clientID: clientID)
+    let config = GIDConfiguration(clientID: self.clientID)
     GIDSignIn.sharedInstance.configuration = config
 
     return try await withCheckedThrowingContinuation { continuation in

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift

@@ -26,6 +26,7 @@ import SwiftUI
 @MainActor
 public struct SignInWithGoogleButton {
   @Environment(AuthService.self) private var authService
+  private let googleProvider = GoogleProviderAuthUI()
 
   let customViewModel = GoogleSignInButtonViewModel(
     scheme: .light,
@@ -38,11 +39,7 @@ extension SignInWithGoogleButton: View {
   public var body: some View {
     GoogleSignInButton(viewModel: customViewModel) {
       Task {
-        guard let clientID = authService.auth.app?.options.clientID else {
-          return
-        }
-        let provider = GoogleProviderAuthUI(clientID: clientID)
-        try await authService.signInWithProvider(provider)
+        try await authService.signInWithProvider(googleProvider)
       }
     }
   }