refactor: update the way password confirmation is displayed

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -138,7 +138,12 @@ public final class AuthService {
 
   private var listenerManager: AuthListenerManager?
 
-  private(set) var emailProvider: EmailProviderSwift?
+  private var emailProvider: EmailProviderSwift?
+
+  public var passwordPrompt: PasswordPromptCoordinator {
+    emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
+  }
+
   var emailSignInEnabled = false
   private var emailSignInCallback: (() -> Void)?
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -33,11 +33,10 @@ public struct AuthPickerView<Content: View> {
 extension AuthPickerView: View {
   public var body: some View {
     @Bindable var authService = authService
-    @Bindable var passwordPrompt = authService.emailProvider?
-      .passwordPrompt ?? PasswordPromptCoordinator()
     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
@@ -80,10 +79,10 @@ extension AuthPickerView: View {
         .accountConflictHandler()
         // Apply MFA handling at NavigationStack level
         .mfaHandler()
-      }
-      // Centralized password prompt sheet to prevent conflicts
-      .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
-        PasswordPromptSheet(coordinator: passwordPrompt)
+        // Centralized password prompt sheet inside auth flow
+        .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
+          PasswordPromptSheet(coordinator: passwordPrompt)
+        }
       }
   }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePasswordView.swift

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