refactor: passwordPrompt should be on emailprovider, not auth service

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -132,13 +132,13 @@ public final class AuthService {
   public var authenticationState: AuthenticationState = .unauthenticated
   public var authenticationFlow: AuthenticationFlow = .signIn
 
-  public var passwordPrompt: PasswordPromptCoordinator = .init()
   private var currentMFAResolver: MultiFactorResolver?
 
   // MARK: - Provider APIs
 
   private var listenerManager: AuthListenerManager?
 
+  internal private(set) var emailProvider: EmailProviderSwift?
   var emailSignInEnabled = false
   private var emailSignInCallback: (() -> Void)?
 
@@ -316,14 +316,18 @@ public extension AuthService {
 
 public extension AuthService {
   /// Enable email sign-in with default behavior (navigates to email link view)
-  func withEmailSignIn() -> AuthService {
-    return withEmailSignIn { [weak self] in
+  func withEmailSignIn(_ provider: EmailProviderSwift? = nil) -> AuthService {
+    return withEmailSignIn(provider) { [weak self] in
       self?.navigator.push(.emailLink)
     }
   }
 
   /// Enable email sign-in with custom callback
-  func withEmailSignIn(onTap: @escaping () -> Void) -> AuthService {
+  func withEmailSignIn(
+    _ provider: EmailProviderSwift? = nil,
+    onTap: @escaping () -> Void
+  ) -> AuthService {
+    emailProvider = provider ?? EmailProviderSwift()
     emailSignInEnabled = true
     emailSignInCallback = onTap
     return self
@@ -746,8 +750,14 @@ public extension AuthService {
       guard let email = user.email else {
         throw AuthServiceError.invalidCredentials("User does not have an email address")
       }
-      let password = try await passwordPrompt.confirmPassword()
-      let credential = EmailAuthProvider.credential(withEmail: email, password: password)
+      
+      guard let emailProvider = emailProvider else {
+        throw AuthServiceError.providerNotFound(
+          "Email provider not configured. Call withEmailSignIn() first."
+        )
+      }
+      
+      let credential = try await emailProvider.createReauthCredential(email: email)
       _ = try await user.reauthenticate(with: credential)
     } else if providerId == PhoneAuthProviderID {
       // Phone auth requires manual reauthentication via sign out and sign in otherwise it will take

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/EmailProviderAuthUI.swift

@@ -0,0 +1,34 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import FirebaseAuth
+
+/// Email/Password authentication provider
+/// This provider is special and doesn't render in the button list
+@MainActor
+public class EmailProviderSwift: AuthProviderSwift {
+  public let passwordPrompt: PasswordPromptCoordinator
+  public let providerId = EmailAuthProviderID
+  
+  public init(passwordPrompt: PasswordPromptCoordinator = .init()) {
+    self.passwordPrompt = passwordPrompt
+  }
+  
+  /// Create credential for reauthentication
+  func createReauthCredential(email: String) async throws -> AuthCredential {
+    let password = try await passwordPrompt.confirmPassword()
+    return EmailAuthProvider.credential(withEmail: email, password: password)
+  }
+}
+

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -33,7 +33,7 @@ public struct AuthPickerView<Content: View> {
 extension AuthPickerView: View {
   public var body: some View {
     @Bindable var authService = authService
-    @Bindable var passwordPrompt = authService.passwordPrompt
+    @Bindable var passwordPrompt = authService.emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
     content()
       .sheet(isPresented: $authService.isPresented) {
         @Bindable var navigator = authService.navigator
@@ -82,7 +82,7 @@ extension AuthPickerView: View {
       }
       // Centralized password prompt sheet to prevent conflicts
       .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
-        PasswordPromptSheet(coordinator: authService.passwordPrompt)
+        PasswordPromptSheet(coordinator: passwordPrompt)
       }
   }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePasswordView.swift

@@ -53,7 +53,7 @@ public struct UpdatePasswordView {
 
 extension UpdatePasswordView: View {
   public var body: some View {
-    @Bindable var passwordPrompt = authService.passwordPrompt
+    @Bindable var passwordPrompt = authService.emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
     VStack(spacing: 24) {
       AuthTextField(
         text: $password,
@@ -116,7 +116,7 @@ extension UpdatePasswordView: View {
       Text("Your password has been successfully updated.")
     }
     .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
-      PasswordPromptSheet(coordinator: authService.passwordPrompt)
+      PasswordPromptSheet(coordinator: passwordPrompt)
     }
   }
 }