google auth provider update

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -112,6 +112,7 @@ public final class AuthService {
         ]
       ) }
       try safeGoogleProvider.signInWithGoogle(clientID: clientID)
+      updateAuthenticationState()
     } catch {
       authenticationState = .unauthenticated
       throw error

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderSwift.swift

@@ -18,33 +18,45 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
     return GIDSignIn.sharedInstance.handle(url)
   }
 
-  @MainActor public func signInWithGoogle(clientID: String) {
+  @MainActor public func signInWithGoogle(clientID: String) async throws -> AuthCredential {
     guard let presentingViewController = (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {
-//      "Error: Unable to get the presenting view controller."
-      return
+      throw NSError(
+        domain: "GoogleProviderSwiftErrorDomain",
+        code: 1,
+        userInfo: [
+          NSLocalizedDescriptionKey: "Root View controller is not available to present Google sign-in View.",
+        ]
+      )
     }
 
     let config = GIDConfiguration(clientID: clientID)
     GIDSignIn.sharedInstance.configuration = config
-
-    GIDSignIn.sharedInstance.signIn(
-      withPresenting: presentingViewController
-    ) { result, error in
-      guard error == nil else {
-        // Handle error
-        return
-      }
-
-      guard let user = result?.user,
-            let idToken = user.idToken?.tokenString else {
-        // Handle error
-        return
-      }
-
-      let credential = GoogleAuthProvider.credential(withIDToken: idToken,
-                                                     accessToken: user.accessToken
-                                                       .tokenString)
-    }
+    
+    return try await withCheckedThrowingContinuation { continuation in
+        GIDSignIn.sharedInstance.signIn(
+          withPresenting: presentingViewController
+        ) { result, error in
+          if let error = error {
+            continuation.resume(throwing: error)
+            return
+          }
+
+          guard let user = result?.user,
+                let idToken = user.idToken?.tokenString else {
+            continuation.resume(throwing: NSError(
+              domain: "GoogleProviderSwiftErrorDomain",
+              code: 2,
+              userInfo: [
+                NSLocalizedDescriptionKey: "Failed to retrieve user or idToken.",
+              ]
+            ))
+            return
+          }
+
+          let credential = GoogleAuthProvider.credential(withIDToken: idToken,
+                                                         accessToken: user.accessToken.tokenString)
+          continuation.resume(returning: credential)
+        }
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/GoogleButtonView.swift

@@ -38,6 +38,6 @@ extension GoogleButtonView: View {
           .frame(maxWidth: .infinity)
       }
     }
-    Text(errorMessage)
+    Text(errorMessage).foregroundColor(.red)
   }
 }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExampleApp.swift

@@ -43,7 +43,7 @@ struct ContentView: View {
   let authService: AuthService
 
   init() {
-    authService = AuthService()
+    authService = AuthService(googleProvider: googleProvider)
   }
 
   var body: some View {