format

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -98,17 +98,17 @@ public enum AuthServiceError: LocalizedError {
   case invalidEmailLink(String)
   case clientIdNotFound(String)
   case notConfiguredActionCodeSettings(String)
-  
+
   /// Simple reauthentication required (Google, Apple, Facebook, Twitter, etc.)
   /// Can be passed directly to `reauthenticate(context:)` method
   case simpleReauthenticationRequired(context: ReauthContext)
-  
+
   /// Email reauthentication required - user must handle password prompt externally
   case emailReauthenticationRequired(context: ReauthContext)
-  
+
   /// Phone reauthentication required - user must handle SMS verification flow externally
   case phoneReauthenticationRequired(context: ReauthContext)
-  
+
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
   case accountConflict(AccountConflictContext)

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -703,34 +703,34 @@ public extension AuthService {
   /// - Throws: Error if reauthentication fails or provider is not found
   /// - Note: This only works for providers that can automatically obtain credentials.
   ///         For email/phone, handle the flow externally and use `reauthenticate(with:)`
-  public func reauthenticate(context: ReauthContext) async throws {
+  func reauthenticate(context: ReauthContext) async throws {
     guard let user = currentUser else {
       throw AuthServiceError.noCurrentUser
     }
-    
+
     // Find the provider and get credential
     guard let matchingProvider = providers.first(where: { $0.id == context.providerId }),
           let credentialProvider = matchingProvider.provider as? CredentialAuthProviderSwift else {
       throw AuthServiceError.providerNotFound("No provider found for \(context.providerId)")
     }
-    
+
     let credential = try await credentialProvider.createAuthCredential()
     try await user.reauthenticate(with: credential)
     currentUser = auth.currentUser
   }
-  
+
   /// Reauthenticates with a pre-obtained credential
   /// Use this when you've handled getting the credential yourself (email/phone)
   /// - Parameter credential: The authentication credential to use for reauthentication
   /// - Throws: Error if reauthentication fails
-  public func reauthenticate(with credential: AuthCredential) async throws {
+  func reauthenticate(with credential: AuthCredential) async throws {
     guard let user = currentUser else {
       throw AuthServiceError.noCurrentUser
     }
     try await user.reauthenticate(with: credential)
     currentUser = auth.currentUser
   }
-  
+
   /// Internal helper to create reauth context and throw appropriate error
   /// - Throws: Appropriate `AuthServiceError` based on the provider type
   private func requireReauthentication() async throws -> Never {
@@ -741,7 +741,7 @@ public extension AuthService {
       phoneNumber: currentUser?.phoneNumber,
       email: currentUser?.email
     )
-    
+
     switch providerId {
     case EmailAuthProviderID:
       throw AuthServiceError.emailReauthenticationRequired(context: context)
@@ -782,7 +782,7 @@ public extension AuthService {
 
     return providerId
   }
-  
+
   /// Get a user-friendly display name for a provider ID
   /// - Parameter providerId: The provider ID from Firebase Auth
   /// - Returns: A user-friendly name for the provider

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/ReauthenticationHelpers.swift

@@ -23,19 +23,17 @@ import FirebaseAuth
 ///   - operation: The operation to execute
 /// - Throws: Rethrows errors from the operation or reauthentication process
 @MainActor
-public func withReauthenticationIfNeeded(
-  authService: AuthService,
-  coordinator: ReauthenticationCoordinator,
-  operation: @escaping () async throws -> Void
-) async throws {
+public func withReauthenticationIfNeeded(authService: AuthService,
+                                         coordinator: ReauthenticationCoordinator,
+                                         operation: @escaping () async throws
+                                           -> Void) async throws {
   do {
     try await operation()
   } catch let error as NSError {
     // Check if reauthentication is needed
     if error.domain == AuthErrorDomain,
        error.code == AuthErrorCode.requiresRecentLogin.rawValue ||
        error.code == AuthErrorCode.userTokenExpired.rawValue {
-      
       // Determine the provider context
       let providerId = try await authService.getCurrentSignInProvider()
       let context = ReauthContext(
@@ -44,18 +42,18 @@ public func withReauthenticationIfNeeded(
         phoneNumber: authService.currentUser?.phoneNumber,
         email: authService.currentUser?.email
       )
-      
+
       // Handle based on provider type
       switch providerId {
       case PhoneAuthProviderID, EmailAuthProviderID:
         // For email/phone, use coordinator to handle UI flow
         try await coordinator.requestReauth(context: context)
-        
+
       default:
         // For simple providers (Google, Apple, etc.), AuthService can handle it directly
         try await authService.reauthenticate(context: context)
       }
-      
+
       // Retry the operation after successful reauth
       try await operation()
     } else {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordPromptView.swift

@@ -21,17 +21,17 @@ import SwiftUI
 public struct EmailReauthView {
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
-  
+
   let email: String
   let coordinator: ReauthenticationCoordinator
-  
+
   @State private var password = ""
   @State private var isLoading = false
   @State private var error: AlertError?
-  
+
   private func verifyPassword() {
     guard !password.isEmpty else { return }
-    
+
     Task { @MainActor in
       isLoading = true
       do {
@@ -64,24 +64,24 @@ extension EmailReauthView: View {
           Image(systemName: "lock.circle.fill")
             .font(.system(size: 60))
             .foregroundColor(.blue)
-          
+
           Text("Confirm Password")
             .font(.title)
             .fontWeight(.bold)
-          
+
           Text("For security, please enter your password")
             .font(.body)
             .foregroundColor(.secondary)
             .multilineTextAlignment(.center)
         }
         .padding()
-        
+
         VStack(spacing: 20) {
           Text("Email: \(email)")
             .font(.caption)
             .frame(maxWidth: .infinity, alignment: .leading)
             .padding(.bottom, 8)
-          
+
           AuthTextField(
             text: $password,
             label: authService.string.passwordFieldLabel,
@@ -97,7 +97,7 @@ extension EmailReauthView: View {
           )
           .submitLabel(.done)
           .accessibilityIdentifier("email-reauth-password-field")
-          
+
           Button(action: verifyPassword) {
             if isLoading {
               ProgressView()
@@ -112,13 +112,13 @@ extension EmailReauthView: View {
           .buttonStyle(.borderedProminent)
           .disabled(password.isEmpty || isLoading)
           .accessibilityIdentifier("confirm-password-button")
-          
+
           Button(authService.string.cancelButtonLabel) {
             coordinator.reauthCancelled()
           }
         }
         .padding(.horizontal)
-        
+
         Spacer()
       }
       .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PhoneReauthView.swift

@@ -133,7 +133,6 @@ extension PhoneReauthView: View {
             Button(authService.string.cancelButtonLabel) {
               coordinator.reauthCancelled()
             }
-            
           }
           .padding(.horizontal)
         } else {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/ReauthenticationModifier.swift

@@ -78,7 +78,7 @@ struct ReauthenticationModifier: ViewModifier {
     Task {
       do {
         guard let context = coordinator.reauthContext else { return }
-        
+
         // For simple providers (Google, Apple, etc.), call reauthenticate with context
         try await authService.reauthenticate(context: context)
         coordinator.reauthCompleted()