fix: make account handler optional, throw error if not available

russellwheatley · russellwheatley · commit 512668c5fbea · 2025-11-06T15:12:35.000Z
diff --git a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift
@@ -37,10 +37,13 @@ extension SignInWithAppleButton: View {
       Task {
         do {
           _ = try await authService.signIn(provider)
-        } catch let AuthServiceError.accountConflict(context) {
-          accountConflictHandler(context)
         } catch {
-          // Other errors handled by .errorAlert()
+          if case let AuthServiceError.accountConflict(context) = error,
+             let handler = accountConflictHandler {
+            handler(context)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AccountConflictModifier.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AccountConflictModifier.swift
@@ -17,11 +17,11 @@ import SwiftUI
 
 /// Environment key for accessing the account conflict handler
 public struct AccountConflictHandlerKey: @preconcurrency EnvironmentKey {
-  @MainActor public static let defaultValue: (AccountConflictContext) -> Void = { _ in }
+  @MainActor public static let defaultValue: ((AccountConflictContext) -> Void)? = nil
 }
 
 public extension EnvironmentValues {
-  var accountConflictHandler: (AccountConflictContext) -> Void {
+  var accountConflictHandler: ((AccountConflictContext) -> Void)? {
     get { self[AccountConflictHandlerKey.self] }
     set { self[AccountConflictHandlerKey.self] = newValue }
   }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift
@@ -50,23 +50,29 @@ public struct EmailAuthView {
     }
   }
 
-  private func signInWithEmailPassword() async {
+  private func signInWithEmailPassword() async throws {
     do {
       _ = try await authService.signIn(email: email, password: password)
-    } catch let AuthServiceError.accountConflict(context) {
-      accountConflictHandler(context)
     } catch {
-      // Other errors handled by .errorAlert()
+      if case let AuthServiceError.accountConflict(context) = error,
+         let handler = accountConflictHandler {
+        handler(context)
+      } else {
+        throw error
+      }
     }
   }
 
-  private func createUserWithEmailPassword() async {
+  private func createUserWithEmailPassword() async throws {
     do {
       _ = try await authService.createUser(email: email, password: password)
-    } catch let AuthServiceError.accountConflict(context) {
-      accountConflictHandler(context)
     } catch {
-      // Other errors handled by .errorAlert()
+      if case let AuthServiceError.accountConflict(context) = error,
+         let handler = accountConflictHandler {
+        handler(context)
+      } else {
+        throw error
+      }
     }
   }
 }
@@ -96,7 +102,7 @@ extension EmailAuthView: View {
         contentType: .password,
         sensitive: true,
         onSubmit: { _ in
-          Task { await signInWithEmailPassword() }
+          Task { try? await signInWithEmailPassword() }
         },
         leading: {
           Image(systemName: "lock")
@@ -123,7 +129,7 @@ extension EmailAuthView: View {
           contentType: .password,
           sensitive: true,
           onSubmit: { _ in
-            Task { await createUserWithEmailPassword() }
+            Task { try? await createUserWithEmailPassword() }
           },
           leading: {
             Image(systemName: "lock")
@@ -137,9 +143,9 @@ extension EmailAuthView: View {
       Button(action: {
         Task {
           if authService.authenticationFlow == .signIn {
-            await signInWithEmailPassword()
+            try? await signInWithEmailPassword()
           } else {
-            await createUserWithEmailPassword()
+            try? await createUserWithEmailPassword()
           }
         }
       }) {
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift
@@ -89,10 +89,13 @@ extension EmailLinkView: View {
       Task {
         do {
           try await authService.handleSignInLink(url: url)
-        } catch let AuthServiceError.accountConflict(context) {
-          accountConflictHandler(context)
         } catch {
-          // Other errors handled by .errorAlert()
+          if case let AuthServiceError.accountConflict(context) = error,
+             let handler = accountConflictHandler {
+            handler(context)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift
@@ -63,10 +63,13 @@ struct EnterVerificationCodeView: View {
 
               _ = try await authService.signIn(credentials: credential)
               authService.navigator.clear()
-            } catch let AuthServiceError.accountConflict(context) {
-              accountConflictHandler(context)
             } catch {
-              // Other errors handled by .errorAlert()
+              if case let AuthServiceError.accountConflict(context) = error,
+                 let handler = accountConflictHandler {
+                handler(context)
+              } else {
+                throw error
+              }
             }
           }
         }) {
diff --git a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift
@@ -40,10 +40,13 @@ extension SignInWithFacebookButton: View {
       Task {
         do {
           _ = try await authService.signIn(facebookProvider)
-        } catch let AuthServiceError.accountConflict(context) {
-          accountConflictHandler(context)
         } catch {
-          // Other errors handled by .errorAlert()
+          if case let AuthServiceError.accountConflict(context) = error,
+             let handler = accountConflictHandler {
+            handler(context)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift
@@ -44,10 +44,13 @@ extension SignInWithGoogleButton: View {
       Task {
         do {
           _ = try await authService.signIn(googleProvider)
-        } catch let AuthServiceError.accountConflict(context) {
-          accountConflictHandler(context)
         } catch {
-          // Other errors handled by .errorAlert()
+          if case let AuthServiceError.accountConflict(context) = error,
+             let handler = accountConflictHandler {
+            handler(context)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift
@@ -54,10 +54,13 @@ extension GenericOAuthButton: View {
         Task {
           do {
             _ = try await authService.signIn(provider)
-          } catch let AuthServiceError.accountConflict(context) {
-            accountConflictHandler(context)
           } catch {
-            // Other errors handled by .errorAlert()
+            if case let AuthServiceError.accountConflict(context) = error,
+               let handler = accountConflictHandler {
+              handler(context)
+            } else {
+              throw error
+            }
           }
         }
       }
diff --git a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift
@@ -37,10 +37,13 @@ extension SignInWithTwitterButton: View {
       Task {
         do {
           _ = try await authService.signIn(provider)
-        } catch let AuthServiceError.accountConflict(context) {
-          accountConflictHandler(context)
         } catch {
-          // Other errors handled by .errorAlert()
+          if case let AuthServiceError.accountConflict(context) = error,
+             let handler = accountConflictHandler {
+            handler(context)
+          } else {
+            throw error
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,13 @@ extension SignInWithAppleButton: View {`
`37`	`37`	`Task {`
`38`	`38`	`do {`
`39`	`39`	`_ = try await authService.signIn(provider)`
`40`		`- } catch let AuthServiceError.accountConflict(context) {`
`41`		`- accountConflictHandler(context)`
`42`	`40`	`} catch {`
`43`		`- // Other errors handled by .errorAlert()`
	`41`	`+ if case let AuthServiceError.accountConflict(context) = error,`
	`42`	`+ let handler = accountConflictHandler {`
	`43`	`+ handler(context)`
	`44`	`+ } else {`
	`45`	`+ throw error`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ import SwiftUI`
`17`	`17`
`18`	`18`	`/// Environment key for accessing the account conflict handler`
`19`	`19`	`public struct AccountConflictHandlerKey: @preconcurrency EnvironmentKey {`
`20`		`- @MainActor public static let defaultValue: (AccountConflictContext) -> Void = { _ in }`
	`20`	`+ @MainActor public static let defaultValue: ((AccountConflictContext) -> Void)? = nil`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public extension EnvironmentValues {`
`24`		`- var accountConflictHandler: (AccountConflictContext) -> Void {`
	`24`	`+ var accountConflictHandler: ((AccountConflictContext) -> Void)? {`
`25`	`25`	`get { self[AccountConflictHandlerKey.self] }`
`26`	`26`	`set { self[AccountConflictHandlerKey.self] = newValue }`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,13 @@ extension EmailLinkView: View {`
`89`	`89`	`Task {`
`90`	`90`	`do {`
`91`	`91`	`try await authService.handleSignInLink(url: url)`
`92`		`- } catch let AuthServiceError.accountConflict(context) {`
`93`		`- accountConflictHandler(context)`
`94`	`92`	`} catch {`
`95`		`- // Other errors handled by .errorAlert()`
	`93`	`+ if case let AuthServiceError.accountConflict(context) = error,`
	`94`	`+ let handler = accountConflictHandler {`
	`95`	`+ handler(context)`
	`96`	`+ } else {`
	`97`	`+ throw error`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`	`}`
`98`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,13 @@ extension SignInWithFacebookButton: View {`
`40`	`40`	`Task {`
`41`	`41`	`do {`
`42`	`42`	`_ = try await authService.signIn(facebookProvider)`
`43`		`- } catch let AuthServiceError.accountConflict(context) {`
`44`		`- accountConflictHandler(context)`
`45`	`43`	`} catch {`
`46`		`- // Other errors handled by .errorAlert()`
	`44`	`+ if case let AuthServiceError.accountConflict(context) = error,`
	`45`	`+ let handler = accountConflictHandler {`
	`46`	`+ handler(context)`
	`47`	`+ } else {`
	`48`	`+ throw error`
	`49`	`+ }`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,13 @@ extension SignInWithGoogleButton: View {`
`44`	`44`	`Task {`
`45`	`45`	`do {`
`46`	`46`	`_ = try await authService.signIn(googleProvider)`
`47`		`- } catch let AuthServiceError.accountConflict(context) {`
`48`		`- accountConflictHandler(context)`
`49`	`47`	`} catch {`
`50`		`- // Other errors handled by .errorAlert()`
	`48`	`+ if case let AuthServiceError.accountConflict(context) = error,`
	`49`	`+ let handler = accountConflictHandler {`
	`50`	`+ handler(context)`
	`51`	`+ } else {`
	`52`	`+ throw error`
	`53`	`+ }`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,13 @@ extension GenericOAuthButton: View {`
`54`	`54`	`Task {`
`55`	`55`	`do {`
`56`	`56`	`_ = try await authService.signIn(provider)`
`57`		`- } catch let AuthServiceError.accountConflict(context) {`
`58`		`- accountConflictHandler(context)`
`59`	`57`	`} catch {`
`60`		`- // Other errors handled by .errorAlert()`
	`58`	`+ if case let AuthServiceError.accountConflict(context) = error,`
	`59`	`+ let handler = accountConflictHandler {`
	`60`	`+ handler(context)`
	`61`	`+ } else {`
	`62`	`+ throw error`
	`63`	`+ }`
`61`	`64`	`}`
`62`	`65`	`}`
`63`	`66`	`}`