refactor: remove currentMFARequired and make private

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Auth/MultiFactor.swift

@@ -100,12 +100,12 @@ public struct EnrollmentSession {
   }
 }
 
-public enum MFAHint {
+public enum MFAHint: Hashable {
   case phone(displayName: String?, uid: String, phoneNumber: String?)
   case totp(displayName: String?, uid: String)
 }
 
-public struct MFARequired {
+public struct MFARequired: Hashable {
   public let hints: [MFAHint]
 
   public init(hints: [MFAHint]) {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -49,7 +49,7 @@ public enum AuthView: Hashable {
   case updatePassword
   case mfaEnrollment
   case mfaManagement
-  case mfaResolution
+  case mfaResolution(MFARequired)
   case enterPhoneNumber
   case enterVerificationCode(verificationID: String, fullPhoneNumber: String)
 }
@@ -133,7 +133,6 @@ public final class AuthService {
   public var authenticationFlow: AuthenticationFlow = .signIn
 
   public var passwordPrompt: PasswordPromptCoordinator = .init()
-  public var currentMFARequired: MFARequired?
   private var currentMFAResolver: MultiFactorResolver?
 
   // MARK: - Provider APIs
@@ -879,7 +878,6 @@ public extension AuthService {
 
   private func handleMFARequiredError(resolver: MultiFactorResolver) -> SignInOutcome {
     let hints = extractMFAHints(from: resolver)
-    currentMFARequired = MFARequired(hints: hints)
     currentMFAResolver = resolver
     return .mfaRequired(MFARequired(hints: hints))
   }
@@ -957,7 +955,6 @@ public extension AuthService {
       updateAuthenticationState()
 
       // Clear MFA resolution state
-      currentMFARequired = nil
       currentMFAResolver = nil
 
     } catch {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -57,8 +57,8 @@ extension AuthPickerView: View {
                 MFAEnrolmentView()
               case AuthView.mfaManagement:
                 MFAManagementView()
-              case AuthView.mfaResolution:
-                MFAResolutionView()
+              case let .mfaResolution(mfaRequired):
+                MFAResolutionView(mfaRequired: mfaRequired)
               case AuthView.enterPhoneNumber:
                 EnterPhoneNumberView()
               case let .enterVerificationCode(verificationID, fullPhoneNumber):

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAHandlerModifier.swift

@@ -39,8 +39,8 @@ struct MFAHandlerModifier: ViewModifier {
   }
 
   /// Handle MFA required - navigate to MFA resolution view
-  func handleMFARequired(_: MFARequired) {
-    authService.navigator.push(.mfaResolution)
+  func handleMFARequired(_ mfaRequired: MFARequired) {
+    authService.navigator.push(.mfaResolution(mfaRequired))
   }
 }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAResolutionView.swift

@@ -23,6 +23,8 @@ private enum FocusableField: Hashable {
 
 @MainActor
 public struct MFAResolutionView {
+  let mfaRequired: MFARequired
+  
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
 
@@ -34,16 +36,12 @@ public struct MFAResolutionView {
 
   @FocusState private var focus: FocusableField?
 
-  public init() {}
-
-  private var mfaRequired: MFARequired? {
-    // This would be set by the sign-in flow when MFA is required
-    authService.currentMFARequired
+  public init(mfaRequired: MFARequired) {
+    self.mfaRequired = mfaRequired
   }
 
   private var selectedHint: MFAHint? {
-    guard let mfaRequired = mfaRequired,
-          selectedHintIndex < mfaRequired.hints.count else {
+    guard selectedHintIndex < mfaRequired.hints.count else {
       return nil
     }
     return mfaRequired.hints[selectedHintIndex]
@@ -63,7 +61,7 @@ public struct MFAResolutionView {
   }
 
   private func startSMSChallenge() {
-    guard selectedHintIndex < (mfaRequired?.hints.count ?? 0) else { return }
+    guard selectedHintIndex < mfaRequired.hints.count else { return }
 
     Task {
       isLoading = true
@@ -128,7 +126,7 @@ extension MFAResolutionView: View {
       .padding(.horizontal)
 
       // MFA Hints Selection (if multiple available)
-      if let mfaRequired = mfaRequired, mfaRequired.hints.count > 1 {
+      if mfaRequired.hints.count > 1 {
         mfaHintsSelectionView(mfaRequired: mfaRequired)
       }
 
@@ -368,34 +366,36 @@ private extension MFAHint {
 #Preview("Phone SMS Only") {
   FirebaseOptions.dummyConfigurationForPreview()
   let authService = AuthService()
-  authService.currentMFARequired = MFARequired(hints: [
+  let mfaRequired = MFARequired(hints: [
     .phone(displayName: "Work Phone", uid: "phone-uid-1", phoneNumber: "+15551234567"),
   ])
-  return MFAResolutionView().environment(authService)
+  return MFAResolutionView(mfaRequired: mfaRequired).environment(authService)
 }
 
 #Preview("TOTP Only") {
   FirebaseOptions.dummyConfigurationForPreview()
   let authService = AuthService()
-  authService.currentMFARequired = MFARequired(hints: [
+  let mfaRequired = MFARequired(hints: [
     .totp(displayName: "Authenticator App", uid: "totp-uid-1"),
   ])
-  return MFAResolutionView().environment(authService)
+  return MFAResolutionView(mfaRequired: mfaRequired).environment(authService)
 }
 
 #Preview("Multiple Methods") {
   FirebaseOptions.dummyConfigurationForPreview()
   let authService = AuthService()
-  authService.currentMFARequired = MFARequired(hints: [
+  let mfaRequired = MFARequired(hints: [
     .phone(displayName: "Mobile", uid: "phone-uid-1", phoneNumber: "+15551234567"),
     .totp(displayName: "Google Authenticator", uid: "totp-uid-1"),
   ])
-  return MFAResolutionView().environment(authService)
+  return MFAResolutionView(mfaRequired: mfaRequired).environment(authService)
 }
 
-#Preview("No MFA Required") {
+#Preview("Single TOTP") {
   FirebaseOptions.dummyConfigurationForPreview()
   let authService = AuthService()
-  // currentMFARequired is nil by default
-  return MFAResolutionView().environment(authService)
+  let mfaRequired = MFARequired(hints: [
+    .totp(displayName: "Authenticator", uid: "totp-uid-1"),
+  ])
+  return MFAResolutionView(mfaRequired: mfaRequired).environment(authService)
 }

samples/swiftui/FirebaseSwiftUISample/FirebaseSwiftUISample/Application/ContentView.swift

@@ -25,7 +25,7 @@ import FirebaseOAuthSwiftUI
 
 struct ContentView: View {
   init() {
-     Auth.auth().useEmulator(withHost: "127.0.0.1", port: 9099)
+//     Auth.auth().useEmulator(withHost: "127.0.0.1", port: 9099)
 
     let actionCodeSettings = ActionCodeSettings()