signing in with google provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -3,7 +3,7 @@ import SwiftUI
 
 public protocol GoogleProviderProtocol {
   func handleUrl(_ url: URL) -> Bool
-  func signInWithGoogle(clientID: String)
+  @MainActor func signInWithGoogle(clientID: String) async throws -> AuthCredential
 }
 
 public enum AuthenticationProvider {
@@ -111,7 +111,9 @@ public final class AuthService {
           NSLocalizedDescriptionKey: "OAuth client ID not found. Please make sure Google Sign-In is enabled in the Firebase console. You may have to download a new GoogleService-Info.plist file after enabling Google Sign-In.",
         ]
       ) }
-      try safeGoogleProvider.signInWithGoogle(clientID: clientID)
+      let credential = try await safeGoogleProvider.signInWithGoogle(clientID: clientID)
+
+      try await signIn(with: credential)
       updateAuthenticationState()
     } catch {
       authenticationState = .unauthenticated

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderSwift.swift

@@ -13,13 +13,13 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
   public init(scopes: [String]? = nil) {
     self.scopes = scopes ?? kDefaultScopes
   }
-  
+
   public func handleUrl(_ url: URL) -> Bool {
     return GIDSignIn.sharedInstance.handle(url)
   }
-  
+
   @MainActor public func signInWithGoogle(clientID: String) async throws -> AuthCredential {
-    guard let presentingViewController = (UIApplication.shared.connectedScenes
+    guard let presentingViewController = await (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {
       throw NSError(
         domain: "GoogleProviderSwiftErrorDomain",
@@ -29,10 +29,10 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
         ]
       )
     }
-    
+
     let config = GIDConfiguration(clientID: clientID)
     GIDSignIn.sharedInstance.configuration = config
-    
+
     return try await withCheckedThrowingContinuation { continuation in
       GIDSignIn.sharedInstance.signIn(
         withPresenting: presentingViewController
@@ -41,7 +41,7 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
           continuation.resume(throwing: error)
           return
         }
-        
+
         guard let user = result?.user,
               let idToken = user.idToken?.tokenString else {
           continuation.resume(throwing: NSError(
@@ -53,7 +53,7 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
           ))
           return
         }
-        
+
         let credential = GoogleAuthProvider.credential(withIDToken: idToken,
                                                        accessToken: user.accessToken.tokenString)
         continuation.resume(returning: credential)