fix: ensure errors are reported from MFA Views

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAEnrolmentView.swift

@@ -26,6 +26,7 @@ private enum FocusableField: Hashable {
 @MainActor
 public struct MFAEnrolmentView {
   @Environment(AuthService.self) private var authService
+  @Environment(\.reportError) private var reportError
 
   @State private var selectedFactorType: SecondFactorType = .sms
   @State private var phoneNumber = ""
@@ -81,12 +82,16 @@ public struct MFAEnrolmentView {
       isLoading = true
       defer { isLoading = false }
 
-      let session = try await authService.startMfaEnrollment(
-        type: selectedFactorType,
-        accountName: authService.currentUser?.email,
-        issuer: authService.configuration.mfaIssuer
-      )
-      currentSession = session
+      do {
+        let session = try await authService.startMfaEnrollment(
+          type: selectedFactorType,
+          accountName: authService.currentUser?.email,
+          issuer: authService.configuration.mfaIssuer
+        )
+        currentSession = session
+      } catch {
+        reportError?(error)
+      }
     }
   }
 
@@ -97,23 +102,27 @@ public struct MFAEnrolmentView {
       isLoading = true
       defer { isLoading = false }
 
-      let fullPhoneNumber = selectedCountry.dialCode + phoneNumber
-      let verificationId = try await authService.sendSmsVerificationForEnrollment(
-        session: session,
-        phoneNumber: fullPhoneNumber
-      )
-      // Update session status
-      currentSession = EnrollmentSession(
-        id: session.id,
-        type: session.type,
-        session: session.session,
-        totpInfo: session.totpInfo,
-        phoneNumber: fullPhoneNumber,
-        verificationId: verificationId,
-        status: .verificationSent,
-        createdAt: session.createdAt,
-        expiresAt: session.expiresAt
-      )
+      do {
+        let fullPhoneNumber = selectedCountry.dialCode + phoneNumber
+        let verificationId = try await authService.sendSmsVerificationForEnrollment(
+          session: session,
+          phoneNumber: fullPhoneNumber
+        )
+        // Update session status
+        currentSession = EnrollmentSession(
+          id: session.id,
+          type: session.type,
+          session: session.session,
+          totpInfo: session.totpInfo,
+          phoneNumber: fullPhoneNumber,
+          verificationId: verificationId,
+          status: .verificationSent,
+          createdAt: session.createdAt,
+          expiresAt: session.expiresAt
+        )
+      } catch {
+        reportError?(error)
+      }
     }
   }
 
@@ -124,18 +133,22 @@ public struct MFAEnrolmentView {
       isLoading = true
       defer { isLoading = false }
 
-      let code = session.type == .sms ? verificationCode : totpCode
-      try await authService.completeEnrollment(
-        session: session,
-        verificationId: session.verificationId,
-        verificationCode: code,
-        displayName: displayName
-      )
-
-      // Reset form state on success
-      resetForm()
-
-      authService.navigator.clear()
+      do {
+        let code = session.type == .sms ? verificationCode : totpCode
+        try await authService.completeEnrollment(
+          session: session,
+          verificationId: session.verificationId,
+          verificationCode: code,
+          displayName: displayName
+        )
+
+        // Reset form state on success
+        resetForm()
+
+        authService.navigator.clear()
+      } catch {
+        reportError?(error)
+      }
     }
   }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAManagementView.swift

@@ -23,6 +23,7 @@ extension MultiFactorInfo: Identifiable {
 @MainActor
 public struct MFAManagementView {
   @Environment(AuthService.self) private var authService
+  @Environment(\.reportError) private var reportError
 
   @State private var enrolledFactors: [MultiFactorInfo] = []
   @State private var isLoading = false
@@ -43,6 +44,7 @@ public struct MFAManagementView {
         enrolledFactors = freshFactors
         isLoading = false
       } catch {
+        reportError?(error)
         isLoading = false
       }
     }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAResolutionView.swift

@@ -24,6 +24,7 @@ private enum FocusableField: Hashable {
 @MainActor
 public struct MFAResolutionView {
   @Environment(AuthService.self) private var authService
+  @Environment(\.reportError) private var reportError
 
   @State private var verificationCode = ""
   @State private var totpCode = ""
@@ -72,6 +73,7 @@ public struct MFAResolutionView {
         self.verificationId = verificationId
         isLoading = false
       } catch {
+        reportError?(error)
         isLoading = false
       }
     }
@@ -93,6 +95,7 @@ public struct MFAResolutionView {
         authService.navigator.clear()
         isLoading = false
       } catch {
+        reportError?(error)
         isLoading = false
       }
     }