refactor: google provider

Author: russellwheatley

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

@@ -31,7 +31,7 @@ import FirebaseAuthSwiftUI
 import Observation
 
 protocol GoogleOperationReauthentication {
-  var googleProvider: GoogleProviderAuthUI { get }
+  var googleProvider: GoogleProviderSwift { get }
 }
 
 extension GoogleOperationReauthentication {
@@ -54,8 +54,8 @@ extension GoogleOperationReauthentication {
 @MainActor
 class GoogleDeleteUserOperation: AuthenticatedOperation,
   @preconcurrency GoogleOperationReauthentication {
-  let googleProvider: GoogleProviderAuthUI
-  init(googleProvider: GoogleProviderAuthUI) {
+  let googleProvider: GoogleProviderSwift
+  init(googleProvider: GoogleProviderSwift) {
     self.googleProvider = googleProvider
   }
 

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

@@ -23,9 +23,9 @@ import FirebaseAuthSwiftUI
 
 public extension AuthService {
   @discardableResult
-  func withGoogleSignIn(scopes scopes: [String]? = nil) -> AuthService {
-    let clientID = auth.app?.options.clientID ?? ""
-    registerProvider(providerWithButton: GoogleProviderAuthUI(scopes: scopes, clientID: clientID))
+  func withGoogleSignIn(_ provider: GoogleProviderSwift? = nil) -> AuthService {
+    registerProvider(providerWithButton: GoogleProviderAuthUI(provider: provider ??
+        GoogleProviderSwift(clientID: auth.app?.options.clientID ?? "")))
     return self
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -19,37 +19,24 @@ import GoogleSignIn
 import GoogleSignInSwift
 import SwiftUI
 
-let kGoogleUserInfoEmailScope = "https://www.googleapis.com/auth/userinfo.email"
-let kGoogleUserInfoProfileScope = "https://www.googleapis.com/auth/userinfo.profile"
-let kDefaultScopes = [kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope]
-
 public enum GoogleProviderError: Error {
   case rootViewControllerNotFound(String)
   case authenticationToken(String)
   case user(String)
 }
 
-public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUserSwift {
-  public let id: String = "google"
+public class GoogleProviderSwift: AuthProviderSwift, DeleteUserSwift {
   let scopes: [String]
-  let shortName = "Google"
+  let clientID: String
   let providerId = "google.com"
-  public let clientID: String
-  
-  public var provider: AuthProviderSwift { self }
-  
-  public init(scopes: [String]? = nil, clientID: String = FirebaseApp.app()!.options.clientID!) {
-    self.scopes = scopes ?? kDefaultScopes
-    self.clientID = clientID
-  }
-
-  @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithGoogleButton())
-  }
 
-  public func deleteUser(user: User) async throws {
-    let operation = GoogleDeleteUserOperation(googleProvider: self)
-    try await operation(on: user)
+  public init(scopes: [String] = [
+    "https://www.googleapis.com/auth/userinfo.email",
+    "https://www.googleapis.com/auth/userinfo.profile",
+  ],
+  clientID: String) {
+    self.clientID = clientID
+    self.scopes = scopes
   }
 
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
@@ -61,7 +48,7 @@ public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUser
         )
     }
 
-    let config = GIDConfiguration(clientID: self.clientID)
+    let config = GIDConfiguration(clientID: clientID)
     GIDSignIn.sharedInstance.configuration = config
 
     return try await withCheckedThrowingContinuation { continuation in
@@ -86,4 +73,22 @@ public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUser
       }
     }
   }
+
+  public func deleteUser(user: User) async throws {
+    let operation = GoogleDeleteUserOperation(googleProvider: self)
+    try await operation(on: user)
+  }
+}
+
+public class GoogleProviderAuthUI: AuthProviderUI {
+  public var provider: AuthProviderSwift
+  public let id: String = "google.com"
+
+  public init(provider: AuthProviderSwift) {
+    self.provider = provider
+  }
+
+  @MainActor public func authButton() -> AnyView {
+    AnyView(SignInWithGoogleButton(googleProvider: provider))
+  }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift

@@ -26,7 +26,11 @@ import SwiftUI
 @MainActor
 public struct SignInWithGoogleButton {
   @Environment(AuthService.self) private var authService
-  private let googleProvider = GoogleProviderAuthUI()
+  let googleProvider: AuthProviderSwift
+
+  public init(googleProvider: AuthProviderSwift) {
+    self.googleProvider = googleProvider
+  }
 
   let customViewModel = GoogleSignInButtonViewModel(
     scheme: .light,
@@ -48,6 +52,7 @@ extension SignInWithGoogleButton: View {
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  return SignInWithGoogleButton()
+  let googleProvider = GoogleProviderSwift(clientID: "")
+  return SignInWithGoogleButton(googleProvider: googleProvider)
     .environment(AuthService())
 }