Merge branch 'main' into swiftui-tests

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -17,7 +17,6 @@ public struct AccountMergeConflictContext: LocalizedError {
 public enum AuthServiceError: LocalizedError {
   case noCurrentUser
   case invalidEmailLink(String)
-  case notConfiguredProvider(String)
   case clientIdNotFound(String)
   case notConfiguredActionCodeSettings(String)
   case reauthenticationRequired(String)
@@ -31,8 +30,6 @@ public enum AuthServiceError: LocalizedError {
       return "No user is currently signed in."
     case let .invalidEmailLink(description):
       return description
-    case let .notConfiguredProvider(description):
-      return description
     case let .clientIdNotFound(description):
       return description
     case let .notConfiguredActionCodeSettings(description):

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift

@@ -6,7 +6,8 @@ protocol EmailPasswordOperationReauthentication {
 }
 
 extension EmailPasswordOperationReauthentication {
-  func reauthenticate() async throws -> AuthenticationToken {
+  // TODO: - @MainActor because User is non-sendable. Might change this once User is sendable in firebase-ios-sdk
+  @MainActor func reauthenticate() async throws -> AuthenticationToken {
     guard let user = Auth.auth().currentUser else {
       throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
     }
@@ -28,6 +29,7 @@ extension EmailPasswordOperationReauthentication {
   }
 }
 
+@MainActor
 class EmailPasswordDeleteUserOperation: AuthenticatedOperation,
   EmailPasswordOperationReauthentication {
   let passwordPrompt: PasswordPromptCoordinator

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -11,17 +11,18 @@ extension NSError {
   }
 }
 
-enum AuthenticationToken {
+public enum AuthenticationToken {
   case apple(ASAuthorizationAppleIDCredential, String)
   case firebase(String)
 }
 
-protocol AuthenticatedOperation {
+@MainActor
+public protocol AuthenticatedOperation {
   func callAsFunction(on user: User) async throws
   func reauthenticate() async throws -> AuthenticationToken
 }
 
-extension AuthenticatedOperation {
+public extension AuthenticatedOperation {
   func callAsFunction(on _: User,
                       _ performOperation: () async throws -> Void) async throws {
     do {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -12,6 +12,7 @@ public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
 
 public protocol FacebookProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential
+  @MainActor func deleteUser(user: User) async throws
 }
 
 public protocol PhoneAuthProviderAuthUIProtocol: ExternalAuthProvider {
@@ -82,17 +83,30 @@ public final class AuthService {
   public var authenticationFlow: AuthenticationFlow = .login
   public var errorMessage = ""
   public let passwordPrompt: PasswordPromptCoordinator = .init()
-
-  public var googleProvider: (any GoogleProviderAuthUIProtocol)?
-  public var facebookProvider: (any FacebookProviderAuthUIProtocol)?
-  public var phoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
+  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) {
-    providers.append(provider)
+    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
+    }
   }
 
   public func renderButtons(spacing: CGFloat = 16) -> AnyView {
@@ -105,31 +119,28 @@ public final class AuthService {
     )
   }
 
-  private var safeGoogleProvider: any GoogleProviderAuthUIProtocol {
+  private var googleProvider: any GoogleProviderAuthUIProtocol {
     get throws {
-      guard let provider = googleProvider else {
-        throw AuthServiceError
-          .notConfiguredProvider("`GoogleProviderSwift` has not been configured")
+      guard let provider = unsafeGoogleProvider else {
+        fatalError("`GoogleProviderAuthUI` has not been configured")
       }
       return provider
     }
   }
 
-  private var safeFacebookProvider: any FacebookProviderAuthUIProtocol {
+  private var facebookProvider: any FacebookProviderAuthUIProtocol {
     get throws {
-      guard let provider = facebookProvider else {
-        throw AuthServiceError
-          .notConfiguredProvider("`FacebookProviderSwift` has not been configured")
+      guard let provider = unsafeFacebookProvider else {
+        fatalError("`FacebookProviderAuthUI` has not been configured")
       }
       return provider
     }
   }
 
-  private var safePhoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
+  private var phoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
     get throws {
-      guard let provider = phoneAuthProvider else {
-        throw AuthServiceError
-          .notConfiguredProvider("`PhoneAuthProviderSwift` has not been configured")
+      guard let provider = unsafePhoneAuthProvider else {
+        fatalError("`PhoneAuthProviderAuthUI` has not been configured")
       }
       return provider
     }
@@ -215,7 +226,8 @@ public final class AuthService {
       if shouldHandleAnonymousUpgrade {
         try await handleAutoUpgradeAnonymousUser(credentials: credentials)
       } else {
-        try await auth.signIn(with: credentials)
+        let result = try await auth.signIn(with: credentials)
+        signedInCredential = result.credential
       }
       updateAuthenticationState()
     } catch {
@@ -247,9 +259,13 @@ public final class AuthService {
 public extension AuthService {
   func deleteUser() async throws {
     do {
-      if let user = auth.currentUser {
-        let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
-        try await operation(on: user)
+      if let user = auth.currentUser, let providerId = signedInCredential?.provider {
+        if providerId == "password" {
+          let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
+          try await operation(on: user)
+        } else if providerId == "facebook.com" {
+          try await facebookProvider.deleteUser(user: user)
+        }
       }
 
     } catch {
@@ -282,6 +298,11 @@ public extension AuthService {
 // MARK: - Email/Password Sign In
 
 public extension AuthService {
+  func withEmailSignIn() -> AuthService {
+    emailSignInEnabled = true
+    return self
+  }
+
   func signIn(withEmail email: String, password: String) async throws {
     let credential = EmailAuthProvider.credential(withEmail: email, password: password)
     try await signIn(credentials: credential)
@@ -295,7 +316,8 @@ public extension AuthService {
         let credential = EmailAuthProvider.credential(withEmail: email, password: password)
         try await handleAutoUpgradeAnonymousUser(credentials: credential)
       } else {
-        try await auth.createUser(withEmail: email, password: password)
+        let result = try await auth.createUser(withEmail: email, password: password)
+        signedInCredential = result.credential
       }
       updateAuthenticationState()
     } catch {
@@ -410,7 +432,7 @@ public extension AuthService {
           "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 safeGoogleProvider.signInWithGoogle(clientID: clientID)
+    let credential = try await googleProvider.signInWithGoogle(clientID: clientID)
 
     try await signIn(credentials: credential)
   }
@@ -420,7 +442,7 @@ public extension AuthService {
 
 public extension AuthService {
   func signInWithFacebook(limitedLogin: Bool = true) async throws {
-    let credential = try await safeFacebookProvider
+    let credential = try await facebookProvider
       .signInWithFacebook(isLimitedLogin: limitedLogin)
     try await signIn(credentials: credential)
   }
@@ -431,7 +453,7 @@ public extension AuthService {
 public extension AuthService {
   func verifyPhoneNumber(phoneNumber: String) async throws -> String {
     do {
-      return try await safePhoneAuthProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
+      return try await phoneAuthProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
     } catch {
       errorMessage = string.localizedErrorMessage(
         for: error

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -1,13 +1,11 @@
+import FirebaseCore
 import SwiftUI
 
 @MainActor
-public struct AuthPickerView<Content: View> {
+public struct AuthPickerView {
   @Environment(AuthService.self) private var authService
-  let providerButtons: () -> Content
 
-  public init(@ViewBuilder providerButtons: @escaping () -> Content) {
-    self.providerButtons = providerButtons
-  }
+  public init() {}
 
   private func switchFlow() {
     authService.authenticationFlow = authService
@@ -29,34 +27,43 @@ extension AuthPickerView: View {
       } else if authService.authView == .emailLink {
         EmailLinkView()
       } else {
-        Text(authService.authenticationFlow == .login ? authService.string
-          .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-        VStack { Divider() }
-
-        EmailAuthView()
+        if authService.emailSignInEnabled {
+          Text(authService.authenticationFlow == .login ? authService.string
+            .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+          Divider()
+          EmailAuthView()
+        }
         VStack {
           authService.renderButtons()
         }.padding(.horizontal)
-
-        VStack { Divider() }
-        HStack {
-          Text(authService
-            .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
-            authService.string.alreadyHaveAnAccountLabel)
-          Button(action: {
-            withAnimation {
-              switchFlow()
-            }
-          }) {
-            Text(authService.authenticationFlow == .signUp ? authService.string
-              .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-              .fontWeight(.semibold)
-              .foregroundColor(.blue)
-          }.accessibilityIdentifier("switch-auth-flow")
+        if authService.emailSignInEnabled {
+          Divider()
+          HStack {
+            Text(authService
+              .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
+              authService.string.alreadyHaveAnAccountLabel)
+            Button(action: {
+              withAnimation {
+                switchFlow()
+              }
+            }) {
+              Text(authService.authenticationFlow == .signUp ? authService.string
+                .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+                .fontWeight(.semibold)
+                .foregroundColor(.blue)
+            }.accessibilityIdentifier("switch-auth-flow")
+          }
         }
         PrivacyTOCsView(displayMode: .footer)
         Text(authService.errorMessage).foregroundColor(.red)
       }
     }
   }
 }
+
+#Preview {
+  FirebaseOptions.dummyConfigurationForPreview()
+  let authService = AuthService()
+    .withEmailSignIn()
+  return AuthPickerView().environment(authService)
+}

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

@@ -0,0 +1,47 @@
+//
+//  AccountService+Facebook.swift
+//  FirebaseUI
+//
+//  Created by Russell Wheatley on 14/05/2025.
+//
+
+@preconcurrency import FirebaseAuth
+import FirebaseAuthSwiftUI
+import Observation
+
+protocol FacebookOperationReauthentication {
+  var facebookProvider: FacebookProviderAuthUI { get }
+}
+
+extension FacebookOperationReauthentication {
+  @MainActor func reauthenticate() async throws -> AuthenticationToken {
+    guard let user = Auth.auth().currentUser else {
+      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
+    }
+
+    do {
+      let credential = try await facebookProvider
+        .signInWithFacebook(isLimitedLogin: facebookProvider.isLimitedLogin)
+      try await user.reauthenticate(with: credential)
+
+      return .firebase("")
+    } catch {
+      throw AuthServiceError.signInFailed(underlying: error)
+    }
+  }
+}
+
+@MainActor
+class FacebookDeleteUserOperation: AuthenticatedOperation,
+  @preconcurrency FacebookOperationReauthentication {
+  let facebookProvider: FacebookProviderAuthUI
+  init(facebookProvider: FacebookProviderAuthUI) {
+    self.facebookProvider = facebookProvider
+  }
+
+  func callAsFunction(on user: User) async throws {
+    try await callAsFunction(on: user) {
+      try await user.delete()
+    }
+  }
+}

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

@@ -10,8 +10,8 @@ import FirebaseAuthSwiftUI
 public extension AuthService {
   @discardableResult
   func withFacebookSignIn(scopes scopes: [String]? = nil) -> AuthService {
-    facebookProvider = FacebookProviderAuthUI(scopes: scopes)
-    register(provider: facebookProvider!)
+    FacebookProviderAuthUI.configureProvider(scopes: scopes)
+    register(provider: FacebookProviderAuthUI.shared)
     return self
   }
 }