♻️ Simplify the code to match the script

Author: peterfriese

fundamentals/apple/auth-google-sign-in/final/Favourites/Shared/Auth/AuthenticationViewModel.swift

@@ -146,38 +146,44 @@ extension AuthenticationViewModel {
   }
 }
 
+enum AuthenticationError: Error {
+  case tokenError(message: String)
+}
+
 extension AuthenticationViewModel {
-  func signInWithGoogle() {
+  func signInWithGoogle() async -> Bool {
     guard let clientID = FirebaseApp.app()?.options.clientID else {
       fatalError("No client ID found in Firebase configuration")
     }
     let config = GIDConfiguration(clientID: clientID)
     GIDSignIn.sharedInstance.configuration = config
 
-    guard let viewController = UIApplication.shared.rootViewController else {
+    guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+          let window = windowScene.windows.first,
+          let rootViewController = window.rootViewController else {
       print("There is no root view controller!")
-      return
+      return false
     }
 
-    Task {
       do {
-        let user = try await GIDSignIn.sharedInstance.signIn(withPresenting: viewController)
+        let userAuthentication = try await GIDSignIn.sharedInstance.signIn(withPresenting: rootViewController)
 
-        let authentication = user.user
-        guard let idToken = authentication.idToken else { return }
-        let accessToken = authentication.accessToken
+        let user = userAuthentication.user
+        guard let idToken = user.idToken else { throw AuthenticationError.tokenError(message: "ID token missing") }
+        let accessToken = user.accessToken
 
         let credential = GoogleAuthProvider.credential(withIDToken: idToken.tokenString,
-                                      accessToken: accessToken.tokenString)
+                                                       accessToken: accessToken.tokenString)
 
         let result = try await Auth.auth().signIn(with: credential)
         let firebaseUser = result.user
         print("User \(firebaseUser.uid) signed in with email \(firebaseUser.email ?? "unknown")")
+        return true
       }
       catch {
         print(error.localizedDescription)
         self.errorMessage = error.localizedDescription
+        return false
       }
-    }
   }
 }

fundamentals/apple/auth-google-sign-in/final/Favourites/Shared/Auth/LoginView.swift

@@ -28,6 +28,7 @@ private enum FocusableField: Hashable {
 
 struct LoginView: View {
   @EnvironmentObject var viewModel: AuthenticationViewModel
+  @Environment(\.colorScheme) var colorScheme
   @Environment(\.dismiss) var dismiss
 
   @FocusState private var focus: FocusableField?
@@ -41,7 +42,11 @@ struct LoginView: View {
   }
 
   private func signInWithGoogle() {
-    viewModel.signInWithGoogle()
+    Task {
+      if await viewModel.signInWithGoogle() == true {
+        dismiss()
+      }
+    }
   }
 
   var body: some View {
@@ -113,7 +118,7 @@ struct LoginView: View {
         VStack { Divider() }
       }
 
-      Button(action: { self.signInWithGoogle() }) {
+      Button(action: signInWithGoogle) {
         Text("Sign in with Google")
           .padding(.vertical, 8)
           .frame(maxWidth: .infinity)
@@ -122,10 +127,9 @@ struct LoginView: View {
               .frame(width: 30, alignment: .center)
           }
       }
-      .foregroundColor(.black)
+      .foregroundColor(colorScheme == .dark ? .white : .black)
       .buttonStyle(.bordered)
 
-
       HStack {
         Text("Don't have an account yet?")
         Button(action: { viewModel.switchFlow() }) {

fundamentals/apple/auth-google-sign-in/starter/Favourites/Shared/Auth/AuthenticationViewModel.swift

@@ -149,6 +149,7 @@ extension AuthenticationViewModel {
 // MARK: - Google Sign-In
 
 extension AuthenticationViewModel {
-  func signInWithGoogle() {
+  func signInWithGoogle() async -> Bool {
+    return false  // replace this with the implementation
   }
 }

fundamentals/apple/auth-google-sign-in/starter/Favourites/Shared/Auth/LoginView.swift

@@ -28,6 +28,7 @@ private enum FocusableField: Hashable {
 
 struct LoginView: View {
   @EnvironmentObject var viewModel: AuthenticationViewModel
+  @Environment(\.colorScheme) var colorScheme
   @Environment(\.dismiss) var dismiss
 
   @FocusState private var focus: FocusableField?
@@ -41,7 +42,11 @@ struct LoginView: View {
   }
 
   private func signInWithGoogle() {
-    viewModel.signInWithGoogle()
+    Task {
+      if await viewModel.signInWithGoogle() == true {
+        dismiss()
+      }
+    }
   }
 
   var body: some View {

fundamentals/apple/auth-google-sign-in/starter/Favourites/Shared/FavouritesApp.swift

@@ -26,7 +26,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
   func application(_ application: UIApplication,
                    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
     FirebaseApp.configure()
-    Auth.auth().useEmulator(withHost:"localhost", port:9099)
     return true
   }
 }