Merge branch 'development' into merge-conflict-refactor

Author: russellwheatley

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift

@@ -114,7 +114,7 @@ extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {
 
 // MARK: - Apple Provider Swift
 
-public class AppleProviderSwift: AuthProviderSwift {
+public class AppleProviderSwift: CredentialAuthProviderSwift {
   public let scopes: [ASAuthorization.Scope]
   let providerId = "apple.com"
 
@@ -140,15 +140,15 @@ public class AppleProviderSwift: AuthProviderSwift {
 }
 
 public class AppleProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: AppleProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
+  public let id: String = "apple.com"
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: AppleProviderSwift) {
+    typedProvider = provider
   }
 
-  public let id: String = "apple.com"
-
   @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithAppleButton(provider: provider))
+    AnyView(SignInWithAppleButton(provider: typedProvider))
   }
 }

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift

@@ -21,8 +21,9 @@ import SwiftUI
 public struct SignInWithAppleButton {
   @Environment(AuthService.self) private var authService
   @Environment(\.accountConflictHandler) private var accountConflictHandler
-  let provider: AuthProviderSwift
-  public init(provider: AuthProviderSwift) {
+  @Environment(\.reportError) private var reportError
+  let provider: AppleProviderSwift
+  public init(provider: AppleProviderSwift) {
     self.provider = provider
   }
 }
@@ -38,12 +39,17 @@ extension SignInWithAppleButton: View {
         do {
           _ = try await authService.signIn(provider)
         } catch {
-          if case let AuthServiceError.accountConflict(context) = error,
-             let handler = accountConflictHandler {
-            handler(context)
-          } else {
-            throw error
+          // 1) Always report first, if a reporter exists
+          reportError?(error)
+
+          // 2) If it's a conflict and we have a handler, handle it and stop
+          if case let AuthServiceError.accountConflict(ctx) = error,
+             let onConflict = accountConflictHandler {
+            onConflict(ctx)
+            return
           }
+
+          throw error
         }
       }
     }