refactor: cleaner and simpler reauth implementation

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift

@@ -12,68 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-@preconcurrency import FirebaseAuth
 import Observation
 
-@MainActor
-protocol EmailPasswordOperationReauthentication {
-  var passwordPrompt: PasswordPromptCoordinator { get }
-}
-
-extension EmailPasswordOperationReauthentication {
-  func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    guard let email = user.email else {
-      throw AuthServiceError.invalidCredentials("User does not have an email address")
-    }
-
-    do {
-      let password = try await passwordPrompt.confirmPassword()
-
-      let credential = EmailAuthProvider.credential(withEmail: email, password: password)
-      _ = try await Auth.auth().currentUser?.reauthenticate(with: credential)
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
-}
-
-@MainActor
-class EmailPasswordDeleteUserOperation: AuthenticatedOperation,
-  EmailPasswordOperationReauthentication {
-  let passwordPrompt: PasswordPromptCoordinator
-
-  init(passwordPrompt: PasswordPromptCoordinator) {
-    self.passwordPrompt = passwordPrompt
-  }
-
-  func callAsFunction(on user: User) async throws {
-    try await callAsFunction(on: user) {
-      try await user.delete()
-    }
-  }
-}
-
-class EmailPasswordUpdatePasswordOperation: AuthenticatedOperation,
-  EmailPasswordOperationReauthentication {
-  let passwordPrompt: PasswordPromptCoordinator
-  let newPassword: String
-
-  init(passwordPrompt: PasswordPromptCoordinator, newPassword: String) {
-    self.passwordPrompt = passwordPrompt
-    self.newPassword = newPassword
-  }
-
-  func callAsFunction(on user: User) async throws {
-    try await callAsFunction(on: user) {
-      try await user.updatePassword(to: newPassword)
-    }
-  }
-}
-
+/// Coordinator for prompting users to enter their password during reauthentication flows
 @MainActor
 @Observable
 public final class PasswordPromptCoordinator {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -283,18 +283,12 @@ public final class AuthService {
 public extension AuthService {
   func deleteUser() async throws {
     do {
-      if let user = auth.currentUser, let providerId = signedInCredential?.provider {
-        if providerId == EmailAuthProviderID {
-          let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
-          try await operation(on: user)
-        } else {
-          // Find provider by matching ID
-          guard let matchingProvider = providers.first(where: { $0.id == providerId }) else {
-            throw AuthServiceError.providerNotFound("No provider found for \(providerId)")
-          }
-
-          try await matchingProvider.provider.deleteUser(user: user)
-        }
+      guard let user = auth.currentUser else {
+        throw AuthServiceError.noCurrentUser
+      }
+      
+      try await withReauthenticationIfNeeded(on: user) {
+        try await user.delete()
       }
     } catch {
       updateError(message: string.localizedErrorMessage(for: error))
@@ -304,14 +298,13 @@ public extension AuthService {
 
   func updatePassword(to password: String) async throws {
     do {
-      if let user = auth.currentUser {
-        let operation = EmailPasswordUpdatePasswordOperation(
-          passwordPrompt: passwordPrompt,
-          newPassword: password
-        )
-        try await operation(on: user)
+      guard let user = auth.currentUser else {
+        throw AuthServiceError.noCurrentUser
+      }
+      
+      try await withReauthenticationIfNeeded(on: user) {
+        try await user.updatePassword(to: password)
       }
-
     } catch {
       updateError(message: string.localizedErrorMessage(for: error))
       throw error