refactor: reuse coordinator for email/phone

Author: russellwheatley

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

@@ -138,12 +138,6 @@ public final class AuthService {
 
   private var listenerManager: AuthListenerManager?
 
-  private var emailProvider: EmailProviderSwift?
-
-  public var passwordPrompt: PasswordPromptCoordinator {
-    emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
-  }
-
   var emailSignInEnabled = false
   private var emailSignInCallback: (() -> Void)?
 
@@ -315,16 +309,14 @@ public extension AuthService {
 
 public extension AuthService {
   /// Enable email sign-in with default behavior (navigates to email link view)
-  func withEmailSignIn(_ provider: EmailProviderSwift? = nil) -> AuthService {
-    return withEmailSignIn(provider) { [weak self] in
+  func withEmailSignIn() -> AuthService {
+    return withEmailSignIn { [weak self] in
       self?.navigator.push(.emailLink)
     }
   }
 
   /// Enable email sign-in with custom callback
-  func withEmailSignIn(_ provider: EmailProviderSwift? = nil,
-                       onTap: @escaping () -> Void) -> AuthService {
-    emailProvider = provider ?? EmailProviderSwift()
+  func withEmailSignIn(onTap: @escaping () -> Void) -> AuthService {
     emailSignInEnabled = true
     emailSignInCallback = onTap
     return self

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -23,6 +23,7 @@ public final class ReauthenticationCoordinator {
   public var reauthContext: ReauthContext?
   public var showingPhoneReauth = false
   public var showingPhoneReauthAlert = false
+  public var showingEmailPasswordPrompt = false
 
   private var continuation: CheckedContinuation<Void, Error>?
 
@@ -34,10 +35,14 @@ public final class ReauthenticationCoordinator {
       self.continuation = continuation
       self.reauthContext = context
 
-      // Show alert first for all providers (including phone)
-      if context.providerId == PhoneAuthProviderID {
+      // Route to appropriate flow based on provider
+      switch context.providerId {
+      case PhoneAuthProviderID:
         self.showingPhoneReauthAlert = true
-      } else {
+      case EmailAuthProviderID:
+        self.showingEmailPasswordPrompt = true
+      default:
+        // For simple providers (Google, Apple, etc.)
         self.isReauthenticating = true
       }
     }
@@ -66,6 +71,7 @@ public final class ReauthenticationCoordinator {
     isReauthenticating = false
     showingPhoneReauth = false
     showingPhoneReauthAlert = false
+    showingEmailPasswordPrompt = false
     reauthContext = nil
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/EmailProviderAuthUI.swift

@@ -36,7 +36,6 @@ extension AuthPickerView: View {
     content()
       .sheet(isPresented: $authService.isPresented) {
         @Bindable var navigator = authService.navigator
-        @Bindable var passwordPrompt = authService.passwordPrompt
         NavigationStack(path: $navigator.routes) {
           authPickerViewInternal
             .navigationTitle(authService.authenticationState == .unauthenticated ? authService
@@ -79,10 +78,6 @@ extension AuthPickerView: View {
         .accountConflictHandler()
         // Apply MFA handling at NavigationStack level
         .mfaHandler()
-        // Centralized password prompt sheet inside auth flow
-        .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
-          PasswordPromptSheet(coordinator: passwordPrompt)
-        }
       }
   }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/ReauthenticationCoordinator.swift

@@ -12,64 +12,127 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import FirebaseAuth
 import FirebaseAuthUIComponents
 import FirebaseCore
 import SwiftUI
 
-struct PasswordPromptSheet {
+@MainActor
+public struct EmailReauthView {
   @Environment(AuthService.self) private var authService
-  @Bindable var coordinator: PasswordPromptCoordinator
+  @Environment(\.reportError) private var reportError
+  
+  let email: String
+  let coordinator: ReauthenticationCoordinator
+  
   @State private var password = ""
+  @State private var isLoading = false
+  @State private var error: AlertError?
+  
+  private func verifyPassword() {
+    guard !password.isEmpty else { return }
+    
+    Task { @MainActor in
+      isLoading = true
+      do {
+        let credential = EmailAuthProvider.credential(withEmail: email, password: password)
+        try await authService.reauthenticate(with: credential)
+        coordinator.reauthCompleted()
+        isLoading = false
+      } catch {
+        if let reportError = reportError {
+          reportError(error)
+        } else {
+          self.error = AlertError(
+            title: "Error",
+            message: error.localizedDescription,
+            underlyingError: error
+          )
+        }
+        isLoading = false
+      }
+    }
+  }
 }
 
-extension PasswordPromptSheet: View {
-  var body: some View {
-    VStack(spacing: 20) {
-      Text(authService.string.confirmPasswordInputLabel)
-        .font(.largeTitle)
-        .fontWeight(.bold)
+extension EmailReauthView: View {
+  public var body: some View {
+    NavigationStack {
+      VStack(spacing: 24) {
+        // Header
+        VStack(spacing: 12) {
+          Image(systemName: "lock.circle.fill")
+            .font(.system(size: 60))
+            .foregroundColor(.blue)
+          
+          Text("Confirm Password")
+            .font(.title)
+            .fontWeight(.bold)
+          
+          Text("For security, please enter your password")
+            .font(.body)
+            .foregroundColor(.secondary)
+            .multilineTextAlignment(.center)
+        }
         .padding()
-
-      Divider()
-
-      AuthTextField(
-        text: $password,
-        label: authService.string.passwordFieldLabel,
-        prompt: authService.string.passwordInputLabel,
-        contentType: .password,
-        isSecureTextField: true,
-        onSubmit: { _ in
-          if !password.isEmpty {
-            coordinator.submit(password: password)
+        
+        VStack(spacing: 20) {
+          Text("Email: \(email)")
+            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.bottom, 8)
+          
+          AuthTextField(
+            text: $password,
+            label: authService.string.passwordFieldLabel,
+            prompt: authService.string.passwordInputLabel,
+            contentType: .password,
+            isSecureTextField: true,
+            onSubmit: { _ in
+              verifyPassword()
+            },
+            leading: {
+              Image(systemName: "lock")
+            }
+          )
+          .submitLabel(.done)
+          .accessibilityIdentifier("email-reauth-password-field")
+          
+          Button(action: verifyPassword) {
+            if isLoading {
+              ProgressView()
+                .frame(height: 32)
+                .frame(maxWidth: .infinity)
+            } else {
+              Text("Confirm")
+                .frame(height: 32)
+                .frame(maxWidth: .infinity)
+            }
+          }
+          .buttonStyle(.borderedProminent)
+          .disabled(password.isEmpty || isLoading)
+          .accessibilityIdentifier("confirm-password-button")
+          
+          Button(authService.string.cancelButtonLabel) {
+            coordinator.reauthCancelled()
           }
-        },
-        leading: {
-          Image(systemName: "lock")
         }
-      )
-      .submitLabel(.next)
-
-      Button(action: {
-        coordinator.submit(password: password)
-      }) {
-        Text(authService.string.okButtonLabel)
-          .padding(.vertical, 8)
-          .frame(maxWidth: .infinity)
-      }
-      .disabled(password.isEmpty)
-      .padding([.top, .bottom, .horizontal], 8)
-      .frame(maxWidth: .infinity)
-      .buttonStyle(.borderedProminent)
-
-      Button(authService.string.cancelButtonLabel) {
-        coordinator.cancel()
+        .padding(.horizontal)
+        
+        Spacer()
       }
+      .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+      .navigationBarTitleDisplayMode(.inline)
     }
-    .padding()
+    .errorAlert(error: $error, okButtonLabel: authService.string.okButtonLabel)
   }
 }
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  return PasswordPromptSheet(coordinator: PasswordPromptCoordinator()).environment(AuthService())
+  return EmailReauthView(
+    email: "[email protected]",
+    coordinator: ReauthenticationCoordinator()
+  )
+  .environment(AuthService())
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -22,7 +22,7 @@ struct ReauthenticationModifier: ViewModifier {
 
   func body(content: Content) -> some View {
     content
-      // Alert for non-phone providers
+      // Alert for simple providers only (Google, Apple, etc.)
       .alert(
         "Authentication Required",
         isPresented: $coordinator.isReauthenticating
@@ -54,7 +54,7 @@ struct ReauthenticationModifier: ViewModifier {
           Text("For security, we need to verify your phone number: \(phoneNumber)")
         }
       }
-      // Sheet for phone reauthentication (shown after alert confirmation)
+      // Sheet for phone reauthentication
       .sheet(isPresented: $coordinator.showingPhoneReauth) {
         if let phoneNumber = coordinator.reauthContext?.phoneNumber {
           PhoneReauthView(
@@ -63,6 +63,15 @@ struct ReauthenticationModifier: ViewModifier {
           )
         }
       }
+      // Sheet for email reauthentication
+      .sheet(isPresented: $coordinator.showingEmailPasswordPrompt) {
+        if let email = coordinator.reauthContext?.email {
+          EmailReauthView(
+            email: email,
+            coordinator: coordinator
+          )
+        }
+      }
   }
 
   private func performReauth() {