Merge branch 'development' of https://github.com/firebase/FirebaseUI-iOS into feat/ui-fixes

Author: demolaf

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -15,16 +15,56 @@
 import FirebaseAuth
 import SwiftUI
 
-public struct AccountMergeConflictContext: LocalizedError {
+/// 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)
+  /// 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
+}
+
+public struct AccountConflictContext: LocalizedError, Identifiable, Equatable {
+  public let id = UUID()
+  public let conflictType: AccountConflictType
   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 let email: String?
+
+  /// Human-readable description of the conflict type
+  public var conflictDescription: String {
+    switch conflictType {
+    case .accountExistsWithDifferentCredential:
+      return "This account is already registered with a different sign-in method."
+    case .credentialAlreadyInUse:
+      return "This credential is already linked to another account."
+    case .emailAlreadyInUse:
+      return "This email address is already in use."
+    case .anonymousUpgradeConflict:
+      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
+  }
 }
 
 public enum AuthServiceError: LocalizedError {
@@ -35,7 +75,7 @@ public enum AuthServiceError: LocalizedError {
   case reauthenticationRequired(String)
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
-  case accountMergeConflict(context: AccountMergeConflictContext)
+  case accountConflict(AccountConflictContext)
   case providerNotFound(String)
   case multiFactorAuth(String)
   case rootViewControllerNotFound(String)
@@ -64,7 +104,7 @@ public enum AuthServiceError: LocalizedError {
       return description
     case let .signInCancelled(description):
       return description
-    case let .accountMergeConflict(context):
+    case let .accountConflict(context):
       return context.errorDescription
     case let .providerNotFound(description):
       return description

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthConfiguration.swift

@@ -18,11 +18,11 @@ import SwiftUI
 
 public struct AuthConfiguration {
   public let logo: ImageResource?
+  public let languageCode: String?
   public let shouldHideCancelButton: Bool
   public let interactiveDismissEnabled: Bool
   public let shouldAutoUpgradeAnonymousUsers: Bool
   public let customStringsBundle: Bundle?
-  public let languageCode: String?
   public let tosUrl: URL?
   public let privacyPolicyUrl: URL?
   public let emailLinkSignInActionCodeSettings: ActionCodeSettings?
@@ -36,11 +36,11 @@ public struct AuthConfiguration {
 
   public init(
     logo: ImageResource? = nil,
+    languageCode: String? = nil,
     shouldHideCancelButton: Bool = false,
     interactiveDismissEnabled: Bool = true,
     shouldAutoUpgradeAnonymousUsers: Bool = false,
     customStringsBundle: Bundle? = nil,
-    languageCode: String? = nil,
     tosUrl: URL? = nil,
     privacyPolicyUrl: URL? = nil,
     emailLinkSignInActionCodeSettings: ActionCodeSettings? = nil,