refactor: implementations as described in API doc

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -36,6 +36,7 @@ public enum AuthServiceError: LocalizedError {
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
   case accountMergeConflict(context: AccountMergeConflictContext)
+  case providerNotFound(String)
 
   public var errorDescription: String? {
     switch self {
@@ -55,6 +56,8 @@ public enum AuthServiceError: LocalizedError {
       return "Failed to sign in: \(error.localizedDescription)"
     case let .accountMergeConflict(context):
       return context.errorDescription
+    case let .providerNotFound(description):
+      return description
     }
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -15,22 +15,21 @@
 @preconcurrency import FirebaseAuth
 import SwiftUI
 
-public protocol ExternalAuthProvider {
-  var id: String { get }
-  @MainActor func authButton() -> AnyView
+public protocol AuthProviderSwift {
+  @MainActor func createAuthCredential() async throws -> AuthCredential
 }
 
-public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
-  @MainActor func signInWithGoogle(clientID: String) async throws -> AuthCredential
-  @MainActor func deleteUser(user: User) async throws
+public protocol AuthProviderUI {
+  var id: String { get }
+  @MainActor func authButton() -> AnyView
+  var provider: AuthProviderSwift { get }
 }
 
-public protocol FacebookProviderAuthUIProtocol: ExternalAuthProvider {
-  @MainActor func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential
+public protocol DeleteUserSwift {
   @MainActor func deleteUser(user: User) async throws
 }
 
-public protocol PhoneAuthProviderAuthUIProtocol: ExternalAuthProvider {
+public protocol PhoneAuthProviderAuthUIProtocol: AuthProviderSwift {
   @MainActor func verifyPhoneNumber(phoneNumber: String) async throws -> String
 }
 
@@ -137,30 +136,14 @@ public final class AuthService {
 
   // MARK: - Provider APIs
 
-  private var unsafeGoogleProvider: (any GoogleProviderAuthUIProtocol)?
-  private var unsafeFacebookProvider: (any FacebookProviderAuthUIProtocol)?
-  private var unsafePhoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
-
   private var listenerManager: AuthListenerManager?
   public var signedInCredential: AuthCredential?
 
   var emailSignInEnabled = false
 
-  private var providers: [ExternalAuthProvider] = []
-  public func register(provider: ExternalAuthProvider) {
-    switch provider {
-    case let google as GoogleProviderAuthUIProtocol:
-      unsafeGoogleProvider = google
-      providers.append(provider)
-    case let facebook as FacebookProviderAuthUIProtocol:
-      unsafeFacebookProvider = facebook
-      providers.append(provider)
-    case let phone as PhoneAuthProviderAuthUIProtocol:
-      unsafePhoneAuthProvider = phone
-      providers.append(provider)
-    default:
-      break
-    }
+  private var providers: [AuthProviderUI] = []
+  public func registerProvider(provider: AuthProviderUI) {
+    providers.append(provider)
   }
 
   public func renderButtons(spacing: CGFloat = 16) -> AnyView {
@@ -173,31 +156,9 @@ public final class AuthService {
     )
   }
 
-  private var googleProvider: any GoogleProviderAuthUIProtocol {
-    get throws {
-      guard let provider = unsafeGoogleProvider else {
-        fatalError("`GoogleProviderAuthUI` has not been configured")
-      }
-      return provider
-    }
-  }
-
-  private var facebookProvider: any FacebookProviderAuthUIProtocol {
-    get throws {
-      guard let provider = unsafeFacebookProvider else {
-        fatalError("`FacebookProviderAuthUI` has not been configured")
-      }
-      return provider
-    }
-  }
-
-  private var phoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
-    get throws {
-      guard let provider = unsafePhoneAuthProvider else {
-        fatalError("`PhoneAuthProviderAuthUI` has not been configured")
-      }
-      return provider
-    }
+  public func signInWithProvider(_ provider: AuthProviderSwift) async throws {
+    let credential = try await provider.createAuthCredential()
+    try await signIn(credentials: credential)
   }
 
   // MARK: - End Provider APIs
@@ -327,13 +288,16 @@ public extension AuthService {
         if providerId == EmailAuthProviderID {
           let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
           try await operation(on: user)
-        } else if providerId == FacebookAuthProviderID {
-          try await facebookProvider.deleteUser(user: user)
-        } else if providerId == GoogleAuthProviderID {
-          try await googleProvider.deleteUser(user: user)
+        } else {
+          // Find provider by matching ID and ensure it can delete users
+          guard let matchingProvider = providers.first(where: { $0.id == providerId }),
+                let provider = matchingProvider.provider as? DeleteUserSwift else {
+            throw AuthServiceError.providerNotFound("No provider found for \(providerId)")
+          }
+          
+          try await provider.deleteUser(user: user)
         }
       }
-
     } catch {
       errorMessage = string.localizedErrorMessage(
         for: error
@@ -488,43 +452,20 @@ public extension AuthService {
   }
 }
 
-// MARK: - Google Sign In
-
-public extension AuthService {
-  func signInWithGoogle() async throws {
-    guard let clientID = auth.app?.options.clientID else {
-      throw AuthServiceError
-        .clientIdNotFound(
-          "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."
-        )
-    }
-    let credential = try await googleProvider.signInWithGoogle(clientID: clientID)
-
-    try await signIn(credentials: credential)
-  }
-}
-
-// MARK: - Facebook Sign In
-
-public extension AuthService {
-  func signInWithFacebook(limitedLogin: Bool = true) async throws {
-    let credential = try await facebookProvider
-      .signInWithFacebook(isLimitedLogin: limitedLogin)
-    try await signIn(credentials: credential)
-  }
-}
 
 // MARK: - Phone Auth Sign In
 
 public extension AuthService {
   func verifyPhoneNumber(phoneNumber: String) async throws -> String {
-    do {
-      return try await phoneAuthProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
-    } catch {
-      errorMessage = string.localizedErrorMessage(
-        for: error
-      )
-      throw error
+    return try await withCheckedThrowingContinuation { continuation in
+      PhoneAuthProvider.provider()
+        .verifyPhoneNumber(phoneNumber, uiDelegate: nil) { verificationID, error in
+          if let error = error {
+            continuation.resume(throwing: error)
+            return
+          }
+          continuation.resume(returning: verificationID!)
+        }
     }
   }
 

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AuthService+Facebook.swift

@@ -25,7 +25,7 @@ public extension AuthService {
   @discardableResult
   func withFacebookSignIn(scopes scopes: [String]? = nil) -> AuthService {
     FacebookProviderAuthUI.configureProvider(scopes: scopes)
-    register(provider: FacebookProviderAuthUI.shared)
+    registerProvider(provider: FacebookProviderAuthUI.shared)
     return self
   }
 }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -31,7 +31,7 @@ public enum FacebookProviderError: Error {
   case authenticationToken(String)
 }
 
-public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol {
+public class FacebookProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUserSwift {
   public let id: String = "facebook"
   let scopes: [String]
   let shortName = "Facebook"
@@ -41,6 +41,8 @@ public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol {
   private var shaNonce: String?
   // Needed for reauthentication
   var isLimitedLogin: Bool = true
+  
+  public var provider: AuthProviderSwift { self }
 
   @MainActor private static var _shared: FacebookProviderAuthUI =
     .init(scopes: kDefaultFacebookScopes)
@@ -66,6 +68,10 @@ public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol {
     try await operation(on: user)
   }
 
+  @MainActor public func createAuthCredential() async throws -> AuthCredential {
+    return try await signInWithFacebook(isLimitedLogin: true)
+  }
+
   @MainActor public func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential {
     let loginType: LoginTracking = isLimitedLogin ? .limited : .enabled
     self.isLimitedLogin = isLimitedLogin

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift

@@ -65,7 +65,8 @@ extension SignInWithFacebookButton: View {
     Button(action: {
       Task {
         do {
-          try await authService.signInWithFacebook(limitedLogin: limitedLogin)
+          let credential = try await FacebookProviderAuthUI.shared.signInWithFacebook(isLimitedLogin: limitedLogin)
+          try await authService.signIn(credentials: credential)
         } catch {
           switch error {
           case FacebookProviderError.signInCancelled:

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

@@ -25,7 +25,7 @@ public extension AuthService {
   @discardableResult
   func withGoogleSignIn(scopes scopes: [String]? = nil) -> AuthService {
     let clientID = auth.app?.options.clientID ?? ""
-    register(provider: GoogleProviderAuthUI(scopes: scopes, clientID: clientID))
+    registerProvider(provider: GoogleProviderAuthUI(scopes: scopes, clientID: clientID))
     return self
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -29,12 +29,15 @@ public enum GoogleProviderError: Error {
   case user(String)
 }
 
-public class GoogleProviderAuthUI: @preconcurrency GoogleProviderAuthUIProtocol {
+public class GoogleProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUserSwift {
   public let id: String = "google"
   let scopes: [String]
   let shortName = "Google"
   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
@@ -50,6 +53,10 @@ public class GoogleProviderAuthUI: @preconcurrency GoogleProviderAuthUIProtocol
     try await operation(on: user)
   }
 
+  @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 {

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift

@@ -38,7 +38,11 @@ extension SignInWithGoogleButton: View {
   public var body: some View {
     GoogleSignInButton(viewModel: customViewModel) {
       Task {
-        try await authService.signInWithGoogle()
+        guard let clientID = authService.auth.app?.options.clientID else {
+          return
+        }
+        let provider = GoogleProviderAuthUI(clientID: clientID)
+        try await authService.signInWithProvider(provider)
       }
     }
   }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/AuthService+Phone.swift

@@ -24,7 +24,7 @@ import FirebaseAuthSwiftUI
 public extension AuthService {
   @discardableResult
   func withPhoneSignIn() -> AuthService {
-    register(provider: PhoneAuthProviderAuthUI())
+    registerProvider(provider: PhoneAuthProviderAuthUI())
     return self
   }
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -18,12 +18,29 @@ import SwiftUI
 
 public typealias VerificationID = String
 
-public class PhoneAuthProviderAuthUI: @preconcurrency PhoneAuthProviderAuthUIProtocol {
+public class PhoneAuthProviderAuthUI: @preconcurrency PhoneAuthProviderAuthUIProtocol, AuthProviderUI {
   public let id: String = "phone"
+  
+  public var provider: AuthProviderSwift { self }
+  
+  // Store verification details for the signIn method
+  private var storedVerificationID: String?
+  private var storedVerificationCode: String?
 
   @MainActor public func authButton() -> AnyView {
     AnyView(PhoneAuthButtonView())
   }
+  
+  @MainActor public func createAuthCredential() async throws -> AuthCredential {
+    guard let verificationID = storedVerificationID,
+          let verificationCode = storedVerificationCode else {
+      fatalError("Phone authentication requires verifyPhoneNumber to be called first")
+    }
+    return PhoneAuthProvider.provider().credential(
+      withVerificationID: verificationID,
+      verificationCode: verificationCode
+    )
+  }
 
   @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {
     return try await withCheckedThrowingContinuation { continuation in