fix: silent error on cancel

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -170,12 +170,13 @@ public final class AuthService {
       if let phoneProvider = provider as? PhoneAuthProviderSwift {
         phoneProvider.authService = self
       }
-      
+
       let credential = try await provider.createAuthCredential()
       let result = try await signIn(credentials: credential)
       return result
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      // Always pass the underlying error - view decides what to show
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -206,8 +207,8 @@ public final class AuthService {
     currentError = nil
   }
 
-  func updateError(title: String = "Error", message: String) {
-    currentError = AlertError(title: title, message: message)
+  func updateError(title: String = "Error", message: String, underlyingError: Error? = nil) {
+    currentError = AlertError(title: title, message: message, underlyingError: underlyingError)
   }
 
   public var shouldHandleAnonymousUpgrade: Bool {
@@ -221,7 +222,7 @@ public final class AuthService {
       currentUser = nil
       updateAuthenticationState()
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -239,7 +240,7 @@ public final class AuthService {
       updateAuthenticationState()
     } catch {
       authenticationState = .unauthenticated
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -303,7 +304,7 @@ public final class AuthService {
         }
       } else {
         // Don't want error modal on MFA error so we only update here
-        updateError(message: string.localizedErrorMessage(for: error))
+        updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       }
 
       throw error
@@ -325,7 +326,7 @@ public final class AuthService {
         }
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -344,7 +345,7 @@ public extension AuthService {
         try await user.delete()
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -359,7 +360,7 @@ public extension AuthService {
         try await user.updatePassword(to: password)
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -392,7 +393,7 @@ public extension AuthService {
       }
     } catch {
       authenticationState = .unauthenticated
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -401,7 +402,7 @@ public extension AuthService {
     do {
       try await auth.sendPasswordReset(withEmail: email)
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -418,7 +419,7 @@ public extension AuthService {
         actionCodeSettings: actionCodeSettings
       )
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -451,7 +452,7 @@ public extension AuthService {
         emailLink = nil
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -520,7 +521,7 @@ public extension AuthService {
       changeRequest.photoURL = url
       try await changeRequest.commitChanges()
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -535,7 +536,7 @@ public extension AuthService {
       changeRequest.displayName = name
       try await changeRequest.commitChanges()
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -627,7 +628,7 @@ public extension AuthService {
         )
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -679,7 +680,7 @@ public extension AuthService {
 
       return verificationID
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -758,7 +759,7 @@ public extension AuthService {
       }
       currentUser = auth.currentUser
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -847,7 +848,7 @@ public extension AuthService {
 
       return freshFactors
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -917,7 +918,7 @@ public extension AuthService {
         }
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }
@@ -970,7 +971,7 @@ public extension AuthService {
           .multiFactorAuth("Failed to resolve MFA challenge: \(error.localizedDescription)")
       }
     } catch {
-      updateError(message: string.localizedErrorMessage(for: error))
+      updateError(message: string.localizedErrorMessage(for: error), underlyingError: error)
       throw error
     }
   }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/ErrorAlertView.swift

@@ -22,7 +22,11 @@ struct ErrorAlertModifier: ViewModifier {
   func body(content: Content) -> some View {
     content
       .alert(isPresented: Binding<Bool>(
-        get: { error != nil },
+        get: {
+          // View layer decides: Don't show alert for CancellationError
+          guard let error = error else { return false }
+          return !(error.underlyingError is CancellationError)
+        },
         set: { if !$0 { error = nil } }
       )) {
         Alert(
@@ -48,9 +52,11 @@ public struct AlertError: Identifiable {
   public let id = UUID()
   public let title: String
   public let message: String
+  public let underlyingError: Error?
 
-  public init(title: String = "Error", message: String) {
+  public init(title: String = "Error", message: String, underlyingError: Error? = nil) {
     self.title = title
     self.message = message
+    self.underlyingError = underlyingError
   }
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -34,14 +34,14 @@ private class PhoneAuthCoordinator: ObservableObject {
   @Published var verificationCode = ""
   @Published var currentError: AlertError?
   @Published var isProcessing = false
-  
+
   var continuation: CheckedContinuation<AuthCredential, Error>?
-  
+
   enum Step {
     case enterPhoneNumber
     case enterVerificationCode
   }
-  
+
   func sendVerificationCode() async {
     isProcessing = true
     do {
@@ -63,13 +63,13 @@ private class PhoneAuthCoordinator: ObservableObject {
     }
     isProcessing = false
   }
-  
+
   func verifyCodeAndComplete() async {
     isProcessing = true
     do {
       let credential = PhoneAuthProvider.provider()
         .credential(withVerificationID: verificationID, verificationCode: verificationCode)
-      
+
       isPresented = false
       continuation?.resume(returning: credential)
       continuation = nil
@@ -78,10 +78,19 @@ private class PhoneAuthCoordinator: ObservableObject {
       isProcessing = false
     }
   }
-  
+
   func cancel() {
     isPresented = false
-    continuation?.resume(throwing: AuthServiceError.signInCancelled("Phone authentication was cancelled"))
+
+    // Only throw error if user has started the flow (sent verification code)
+    // If they cancel before entering/sending phone number, dismiss silently
+    if !verificationID.isEmpty {
+      continuation?
+        .resume(throwing: AuthServiceError.signInCancelled("Phone authentication was cancelled"))
+    } else {
+      continuation?.resume(throwing: CancellationError())
+    }
+
     continuation = nil
   }
 }
@@ -92,7 +101,7 @@ private class PhoneAuthCoordinator: ObservableObject {
 private struct PhoneAuthFlowView: View {
   @StateObject var coordinator: PhoneAuthCoordinator
   @Environment(AuthService.self) private var authService
-  
+
   var body: some View {
     NavigationStack {
       Group {
@@ -109,7 +118,7 @@ private struct PhoneAuthFlowView: View {
     }
     .interactiveDismissDisabled(authService.configuration.interactiveDismissEnabled)
   }
-  
+
   @ToolbarContentBuilder
   var toolbar: some ToolbarContent {
     ToolbarItem(placement: .topBarTrailing) {
@@ -122,9 +131,9 @@ private struct PhoneAuthFlowView: View {
       }
     }
   }
-  
+
   // MARK: - Phone Number View
-  
+
   var phoneNumberView: some View {
     VStack(spacing: 16) {
       Text(authService.string.enterPhoneNumberPlaceholder)
@@ -173,9 +182,9 @@ private struct PhoneAuthFlowView: View {
     .padding(.horizontal)
     .errorAlert(error: $coordinator.currentError, okButtonLabel: authService.string.okButtonLabel)
   }
-  
+
   // MARK: - Verification Code View
-  
+
   var verificationCodeView: some View {
     VStack(spacing: 32) {
       VStack(spacing: 16) {
@@ -236,10 +245,10 @@ private struct PhoneAuthFlowView: View {
 
 public class PhoneProviderSwift: PhoneAuthProviderSwift {
   private var cancellables = Set<AnyCancellable>()
-  
+
   // Internal use only: Injected automatically by AuthService.signIn()
   public weak var authService: AuthService?
-  
+
   public init() {}
 
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
@@ -248,41 +257,41 @@ public class PhoneProviderSwift: PhoneAuthProviderSwift {
         "AuthService not injected. This should be set automatically by AuthService.signIn()."
       )
     }
-    
+
     // Get the root view controller to present from
     guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
           let rootViewController = windowScene.windows.first?.rootViewController else {
       throw AuthServiceError.rootViewControllerNotFound(
         "Root view controller not available to present phone auth flow"
       )
     }
-    
+
     // Find the topmost view controller
     var topViewController = rootViewController
     while let presented = topViewController.presentedViewController {
       topViewController = presented
     }
-    
+
     // Create coordinator
     let coordinator = PhoneAuthCoordinator()
-    
+
     // Present the flow and wait for result
     return try await withCheckedThrowingContinuation { continuation in
       coordinator.continuation = continuation
-      
+
       // Create SwiftUI view with environment
       let flowView = PhoneAuthFlowView(coordinator: coordinator)
         .environment(authService)
-      
+
       let hostingController = UIHostingController(rootView: flowView)
-      
+
       // Dismiss handler - watch for presentation state changes
       coordinator.$isPresented.sink { [weak hostingController] isPresented in
         if !isPresented {
           hostingController?.dismiss(animated: true)
         }
       }.store(in: &cancellables)
-      
+
       // Present modally
       topViewController.present(hostingController, animated: true)
     }