format

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -17,18 +17,19 @@ import SwiftUI
 
 /// Describes the specific type of account conflict that occurred
 public enum AccountConflictType: Equatable {
-  /// Account exists with a different provider (e.g., user signed up with Google, trying to use email)
+  /// Account exists with a different provider (e.g., user signed up with Google, trying to use
+  /// email)
   /// Solution: Sign in with existing provider, then link the new credential
   case accountExistsWithDifferentCredential
-  
+
   /// The credential is already linked to another account
   /// Solution: User must sign in with that account or unlink the credential
   case credentialAlreadyInUse
-  
+
   /// Email is already registered with another method
   /// Solution: Sign in with existing method, then link if desired
   case emailAlreadyInUse
-  
+
   /// Trying to link anonymous account to an existing account
   /// Solution: Sign out of anonymous, then sign in with the credential
   case anonymousUpgradeConflict
@@ -42,10 +43,10 @@ public struct AccountConflictContext: LocalizedError, Identifiable, Equatable {
   public let message: String
   public let email: String?
   public let existingProviderIds: [String]?
-  
+
   /// Indicates if this conflict occurred during anonymous user upgrade
   public let isAnonymousUpgrade: Bool
-  
+
   /// Human-readable description of the conflict type
   public var conflictDescription: String {
     switch conflictType {
@@ -59,11 +60,11 @@ public struct AccountConflictContext: LocalizedError, Identifiable, Equatable {
       return "Cannot link anonymous account to an existing account."
     }
   }
-  
+
   public var errorDescription: String? {
     return message
   }
-  
+
   public static func == (lhs: AccountConflictContext, rhs: AccountConflictContext) -> Bool {
     // Compare by id since each AccountConflictContext instance is unique
     lhs.id == rhs.id

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -134,7 +134,7 @@ public final class AuthService {
   public let passwordPrompt: PasswordPromptCoordinator = .init()
   public var currentMFARequired: MFARequired?
   private var currentMFAResolver: MultiFactorResolver?
-  
+
   /// Current account conflict context - observe this to handle conflicts and update backend
   public private(set) var currentAccountConflict: AccountConflictContext?
 
@@ -291,15 +291,15 @@ public final class AuthService {
           conflictType: conflictType,
           credential: credentials
         )
-        
+
         // Store it for consumers to observe
         currentAccountConflict = context
-        
+
         // Only set error alert if we're NOT auto-handling it
         if conflictType != .anonymousUpgradeConflict {
           updateError(message: context.message, underlyingError: error)
         }
-        
+
         // Throw the specific error with context
         throw AuthServiceError.accountConflict(context)
       } else {
@@ -856,28 +856,28 @@ public extension AuthService {
   }
 
   // MARK: - Account Conflict Helper Methods
-  
+
   private func determineConflictType(from error: NSError) -> AccountConflictType? {
     switch error.code {
     case AuthErrorCode.accountExistsWithDifferentCredential.rawValue:
-      return shouldHandleAnonymousUpgrade ? .anonymousUpgradeConflict : .accountExistsWithDifferentCredential
+      return shouldHandleAnonymousUpgrade ? .anonymousUpgradeConflict :
+        .accountExistsWithDifferentCredential
     case AuthErrorCode.credentialAlreadyInUse.rawValue:
       return shouldHandleAnonymousUpgrade ? .anonymousUpgradeConflict : .credentialAlreadyInUse
     case AuthErrorCode.emailAlreadyInUse.rawValue:
-      return shouldHandleAnonymousUpgrade ? .anonymousUpgradeConflict :.emailAlreadyInUse
+      return shouldHandleAnonymousUpgrade ? .anonymousUpgradeConflict : .emailAlreadyInUse
     default:
       return nil
     }
   }
-  
-  private func createConflictContext(
-    from error: NSError,
-    conflictType: AccountConflictType,
-    credential: AuthCredential
-  ) -> AccountConflictContext {
-    let updatedCredential = error.userInfo[AuthErrorUserInfoUpdatedCredentialKey] as? AuthCredential ?? credential
+
+  private func createConflictContext(from error: NSError,
+                                     conflictType: AccountConflictType,
+                                     credential: AuthCredential) -> AccountConflictContext {
+    let updatedCredential = error
+      .userInfo[AuthErrorUserInfoUpdatedCredentialKey] as? AuthCredential ?? credential
     let email = error.userInfo[AuthErrorUserInfoEmailKey] as? String
-    
+
     return AccountConflictContext(
       conflictType: conflictType,
       credential: updatedCredential,

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -25,7 +25,7 @@ public struct AuthPickerView<Content: View> {
 
   @Environment(AuthService.self) private var authService
   private let content: () -> Content
-  
+
   // View-layer state for handling auto-linking flow
   @State private var pendingCredentialForLinking: AuthCredential?
 }
@@ -63,7 +63,8 @@ extension AuthPickerView: View {
         }
         .interactiveDismissDisabled(authService.configuration.interactiveDismissEnabled)
       }
-      // View-layer logic: Handle account conflicts (auto-handle anonymous upgrade, store others for linking)
+      // View-layer logic: Handle account conflicts (auto-handle anonymous upgrade, store others for
+      // linking)
       .onChange(of: authService.currentAccountConflict) { _, conflict in
         handleAccountConflict(conflict)
       }
@@ -74,21 +75,21 @@ extension AuthPickerView: View {
         }
       }
   }
-  
+
   /// View-layer logic: Handle account conflicts with type-specific behavior
   private func handleAccountConflict(_ conflict: AccountConflictContext?) {
     guard let conflict = conflict else { return }
-    
+
     // Only auto-handle anonymous upgrade conflicts
     if conflict.conflictType == .anonymousUpgradeConflict {
       Task {
         do {
           // Sign out the anonymous user
           try await authService.signOut()
-          
+
           // Sign in with the new credential
           _ = try await authService.signIn(credentials: conflict.credential)
-          
+
           // Successfully handled - conflict and error are cleared automatically by reset()
         } catch {
           // Error will be shown via normal error handling
@@ -101,11 +102,11 @@ extension AuthPickerView: View {
       // Error modal will show for user to see and handle
     }
   }
-  
+
   /// View-layer logic: Attempt to link pending credential after successful sign-in
   private func attemptAutoLinkPendingCredential() {
     guard let credential = pendingCredentialForLinking else { return }
-    
+
     Task {
       do {
         try await authService.linkAccounts(credentials: credential)

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/ErrorAlertView.swift

@@ -28,10 +28,10 @@ struct ErrorAlertModifier: ViewModifier {
     if error.underlyingError is CancellationError {
       return false
     }
-    
+
     // Don't show alert for anonymous upgrade conflicts (they're auto-handled)
     if let authError = error.underlyingError as? AuthServiceError,
-       case .accountConflict(let context) = authError,
+       case let .accountConflict(context) = authError,
        context.conflictType == .anonymousUpgradeConflict {
       return false
     }