Merge branch 'main' into ui-tweaks

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -1,31 +1,47 @@
 
+import FirebaseAuth
 import SwiftUI
 
+public struct AccountMergeConflictContext: LocalizedError {
+  public let credential: AuthCredential
+  public let underlyingError: Error
+  public let message: String
+  // TODO: - should make this User type once fixed upstream in firebase-ios-sdk. See: https://github.com/firebase/FirebaseUI-iOS/pull/1247#discussion_r2085455355
+  public let uid: String?
+
+  public var errorDescription: String? {
+    return message
+  }
+}
+
 public enum AuthServiceError: LocalizedError {
-  case invalidEmailLink
-  case notConfiguredProvider(String)
+  case noCurrentUser
+  case invalidEmailLink(String)
   case clientIdNotFound(String)
-  case notConfiguredActionCodeSettings
+  case notConfiguredActionCodeSettings(String)
   case reauthenticationRequired(String)
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
+  case accountMergeConflict(context: AccountMergeConflictContext)
 
   public var errorDescription: String? {
     switch self {
-    case .invalidEmailLink:
-      return "Invalid sign in link. Most likely, the link you used has expired. Try signing in again."
-    case let .notConfiguredProvider(description):
+    case .noCurrentUser:
+      return "No user is currently signed in."
+    case let .invalidEmailLink(description):
       return description
     case let .clientIdNotFound(description):
       return description
-    case .notConfiguredActionCodeSettings:
-      return "ActionCodeSettings has not been configured for `AuthConfiguration.emailLinkSignInActionCodeSettings`"
+    case let .notConfiguredActionCodeSettings(description):
+      return description
     case let .reauthenticationRequired(description):
       return description
     case let .invalidCredentials(description):
       return description
     case let .signInFailed(underlying: error):
       return "Failed to sign in: \(error.localizedDescription)"
+    case let .accountMergeConflict(context):
+      return context.errorDescription
     }
   }
 }

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

@@ -6,7 +6,8 @@ protocol EmailPasswordOperationReauthentication {
 }
 
 extension EmailPasswordOperationReauthentication {
-  func reauthenticate() async throws -> AuthenticationToken {
+  // TODO: - @MainActor because User is non-sendable. Might change this once User is sendable in firebase-ios-sdk
+  @MainActor func reauthenticate() async throws -> AuthenticationToken {
     guard let user = Auth.auth().currentUser else {
       throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
     }
@@ -28,6 +29,7 @@ extension EmailPasswordOperationReauthentication {
   }
 }
 
+@MainActor
 class EmailPasswordDeleteUserOperation: AuthenticatedOperation,
   EmailPasswordOperationReauthentication {
   let passwordPrompt: PasswordPromptCoordinator

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -11,17 +11,18 @@ extension NSError {
   }
 }
 
-enum AuthenticationToken {
+public enum AuthenticationToken {
   case apple(ASAuthorizationAppleIDCredential, String)
   case firebase(String)
 }
 
-protocol AuthenticatedOperation {
+@MainActor
+public protocol AuthenticatedOperation {
   func callAsFunction(on user: User) async throws
   func reauthenticate() async throws -> AuthenticationToken
 }
 
-extension AuthenticatedOperation {
+public extension AuthenticatedOperation {
   func callAsFunction(on _: User,
                       _ performOperation: () async throws -> Void) async throws {
     do {