chore: make reportError() optionally called

russellwheatley · russellwheatley · commit 8b2c9065ea36 · 2025-11-06T16:25:26.000Z
diff --git a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift
@@ -37,8 +37,12 @@ extension SignInWithAppleButton: View {
       Task {
         do {
           _ = try await authService.signIn(provider)
-        } catch let caughtError {
-          reportError(caughtError)
+        } catch {
+          if let errorHandler = reportError {
+            errorHandler(error)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift
@@ -53,16 +53,24 @@ public struct EmailAuthView {
   private func signInWithEmailPassword() async {
     do {
       _ = try await authService.signIn(email: email, password: password)
-    } catch let caughtError {
-      reportError(caughtError)
+    } catch {
+      if let errorHandler = reportError {
+        errorHandler(error)
+      } else {
+        throw error
+      }
     }
   }
 
   private func createUserWithEmailPassword() async {
     do {
       _ = try await authService.createUser(email: email, password: password)
-    } catch let caughtError {
-      reportError(caughtError)
+    } catch {
+      if let errorHandler = reportError {
+        errorHandler(error)
+      } else {
+        throw error
+      }
     }
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift
@@ -29,8 +29,12 @@ public struct EmailLinkView {
     do {
       try await authService.sendEmailSignInLink(email: email)
       showModal = true
-    } catch let caughtError {
-      reportError(caughtError)
+    } catch {
+      if let errorHandler = reportError {
+        errorHandler(error)
+      } else {
+        throw error
+      }
     }
   }
 }
@@ -89,8 +93,12 @@ extension EmailLinkView: View {
       Task {
         do {
           try await authService.handleSignInLink(url: url)
-        } catch let caughtError {
-          reportError(caughtError)
+        } catch {
+          if let errorHandler = reportError {
+            errorHandler(error)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift
@@ -55,8 +55,12 @@ struct EnterPhoneNumberView: View {
               verificationID: id,
               fullPhoneNumber: fullPhoneNumber
             ))
-          } catch let caughtError {
-            reportError(caughtError)
+          } catch {
+            if let errorHandler = reportError {
+              errorHandler(error)
+            } else {
+              throw error
+            }
           }
         }
       }) {
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift
@@ -58,8 +58,12 @@ struct EnterVerificationCodeView: View {
                 verificationCode: verificationCode
               )
               authService.navigator.clear()
-            } catch let caughtError {
-              reportError(caughtError)
+            } catch {
+              if let errorHandler = reportError {
+                errorHandler(error)
+              } else {
+                throw error
+              }
             }
           }
         }) {
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/ErrorAlertView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/ErrorAlertView.swift
@@ -88,12 +88,12 @@ public struct AlertError: Identifiable, Equatable {
 
 /// Environment key for error reporting closure
 private struct ReportErrorKey: @preconcurrency EnvironmentKey {
-  @MainActor static let defaultValue: (Error) -> Void = { _ in }
+  @MainActor static let defaultValue: ((Error) -> Void)? = nil
 }
 
 public extension EnvironmentValues {
-  /// Closure to report errors to the parent view for display
-  var reportError: (Error) -> Void {
+  /// Optional closure to report errors to the parent view for display
+  var reportError: ((Error) -> Void)? {
     get { self[ReportErrorKey.self] }
     set { self[ReportErrorKey.self] = newValue }
   }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift
@@ -26,8 +26,12 @@ public struct SignedInView {
     do {
       try await authService.sendEmailVerification()
       showEmailVerificationSent = true
-    } catch let caughtError {
-      reportError(caughtError)
+    } catch {
+      if let errorHandler = reportError {
+        errorHandler(error)
+      } else {
+        throw error
+      }
     }
   }
 }
@@ -99,8 +103,12 @@ extension SignedInView: View {
         Task {
           do {
             try await authService.signOut()
-          } catch let caughtError {
-            reportError(caughtError)
+          } catch {
+            if let errorHandler = reportError {
+              errorHandler(error)
+            } else {
+              throw error
+            }
           }
         }
       } label: {
@@ -121,8 +129,12 @@ extension SignedInView: View {
           Task {
             do {
               try await authService.deleteUser()
-            } catch let caughtError {
-              reportError(caughtError)
+            } catch {
+              if let errorHandler = reportError {
+                errorHandler(error)
+              } else {
+                throw error
+              }
             }
           }
         },
diff --git a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift
@@ -40,8 +40,12 @@ extension SignInWithFacebookButton: View {
       Task {
         do {
           _ = try await authService.signIn(facebookProvider)
-        } catch let caughtError {
-          reportError(caughtError)
+        } catch {
+          if let errorHandler = reportError {
+            errorHandler(error)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift
@@ -44,8 +44,12 @@ extension SignInWithGoogleButton: View {
       Task {
         do {
           _ = try await authService.signIn(googleProvider)
-        } catch let caughtError {
-          reportError(caughtError)
+        } catch {
+          if let errorHandler = reportError {
+            errorHandler(error)
+          } else {
+            throw error
+          }
         }
       }
     }
diff --git a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift
@@ -47,8 +47,12 @@ extension GenericOAuthButton: View {
         Task {
           do {
             _ = try await authService.signIn(provider)
-          } catch let caughtError {
-            reportError(caughtError)
+          } catch {
+            if let errorHandler = reportError {
+              errorHandler(error)
+            } else {
+              throw error
+            }
           }
         }
       }
diff --git a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift
@@ -37,8 +37,12 @@ extension SignInWithTwitterButton: View {
       Task {
         do {
           _ = try await authService.signIn(provider)
-        } catch let caughtError {
-          reportError(caughtError)
+        } catch {
+          if let errorHandler = reportError {
+            errorHandler(error)
+          } else {
+            throw error
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,12 @@ extension SignInWithAppleButton: View {`
`37`	`37`	`Task {`
`38`	`38`	`do {`
`39`	`39`	`_ = try await authService.signIn(provider)`
`40`		`- } catch let caughtError {`
`41`		`- reportError(caughtError)`
	`40`	`+ } catch {`
	`41`	`+ if let errorHandler = reportError {`
	`42`	`+ errorHandler(error)`
	`43`	`+ } else {`
	`44`	`+ throw error`
	`45`	`+ }`
`42`	`46`	`}`
`43`	`47`	`}`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,16 +53,24 @@ public struct EmailAuthView {`
`53`	`53`	`private func signInWithEmailPassword() async {`
`54`	`54`	`do {`
`55`	`55`	`_ = try await authService.signIn(email: email, password: password)`
`56`		`- } catch let caughtError {`
`57`		`- reportError(caughtError)`
	`56`	`+ } catch {`
	`57`	`+ if let errorHandler = reportError {`
	`58`	`+ errorHandler(error)`
	`59`	`+ } else {`
	`60`	`+ throw error`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`private func createUserWithEmailPassword() async {`
`62`	`66`	`do {`
`63`	`67`	`_ = try await authService.createUser(email: email, password: password)`
`64`		`- } catch let caughtError {`
`65`		`- reportError(caughtError)`
	`68`	`+ } catch {`
	`69`	`+ if let errorHandler = reportError {`
	`70`	`+ errorHandler(error)`
	`71`	`+ } else {`
	`72`	`+ throw error`
	`73`	`+ }`
`66`	`74`	`}`
`67`	`75`	`}`
`68`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,12 @@ public struct EmailLinkView {`
`29`	`29`	`do {`
`30`	`30`	`try await authService.sendEmailSignInLink(email: email)`
`31`	`31`	`showModal = true`
`32`		`- } catch let caughtError {`
`33`		`- reportError(caughtError)`
	`32`	`+ } catch {`
	`33`	`+ if let errorHandler = reportError {`
	`34`	`+ errorHandler(error)`
	`35`	`+ } else {`
	`36`	`+ throw error`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`	`}`
`36`	`40`	`}`
`@@ -89,8 +93,12 @@ extension EmailLinkView: View {`
`89`	`93`	`Task {`
`90`	`94`	`do {`
`91`	`95`	`try await authService.handleSignInLink(url: url)`
`92`		`- } catch let caughtError {`
`93`		`- reportError(caughtError)`
	`96`	`+ } catch {`
	`97`	`+ if let errorHandler = reportError {`
	`98`	`+ errorHandler(error)`
	`99`	`+ } else {`
	`100`	`+ throw error`
	`101`	`+ }`
`94`	`102`	`}`
`95`	`103`	`}`
`96`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,12 @@ struct EnterVerificationCodeView: View {`
`58`	`58`	`verificationCode: verificationCode`
`59`	`59`	`)`
`60`	`60`	`authService.navigator.clear()`
`61`		`- } catch let caughtError {`
`62`		`- reportError(caughtError)`
	`61`	`+ } catch {`
	`62`	`+ if let errorHandler = reportError {`
	`63`	`+ errorHandler(error)`
	`64`	`+ } else {`
	`65`	`+ throw error`
	`66`	`+ }`
`63`	`67`	`}`
`64`	`68`	`}`
`65`	`69`	`}) {`
Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,12 @@ public struct AlertError: Identifiable, Equatable {`
`88`	`88`
`89`	`89`	`/// Environment key for error reporting closure`
`90`	`90`	`private struct ReportErrorKey: @preconcurrency EnvironmentKey {`
`91`		`- @MainActor static let defaultValue: (Error) -> Void = { _ in }`
	`91`	`+ @MainActor static let defaultValue: ((Error) -> Void)? = nil`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public extension EnvironmentValues {`
`95`		`- /// Closure to report errors to the parent view for display`
`96`		`- var reportError: (Error) -> Void {`
	`95`	`+ /// Optional closure to report errors to the parent view for display`
	`96`	`+ var reportError: ((Error) -> Void)? {`
`97`	`97`	`get { self[ReportErrorKey.self] }`
`98`	`98`	`set { self[ReportErrorKey.self] = newValue }`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,12 @@ extension SignInWithFacebookButton: View {`
`40`	`40`	`Task {`
`41`	`41`	`do {`
`42`	`42`	`_ = try await authService.signIn(facebookProvider)`
`43`		`- } catch let caughtError {`
`44`		`- reportError(caughtError)`
	`43`	`+ } catch {`
	`44`	`+ if let errorHandler = reportError {`
	`45`	`+ errorHandler(error)`
	`46`	`+ } else {`
	`47`	`+ throw error`
	`48`	`+ }`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,12 @@ extension SignInWithGoogleButton: View {`
`44`	`44`	`Task {`
`45`	`45`	`do {`
`46`	`46`	`_ = try await authService.signIn(googleProvider)`
`47`		`- } catch let caughtError {`
`48`		`- reportError(caughtError)`
	`47`	`+ } catch {`
	`48`	`+ if let errorHandler = reportError {`
	`49`	`+ errorHandler(error)`
	`50`	`+ } else {`
	`51`	`+ throw error`
	`52`	`+ }`
`49`	`53`	`}`
`50`	`54`	`}`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,12 @@ extension GenericOAuthButton: View {`
`47`	`47`	`Task {`
`48`	`48`	`do {`
`49`	`49`	`_ = try await authService.signIn(provider)`
`50`		`- } catch let caughtError {`
`51`		`- reportError(caughtError)`
	`50`	`+ } catch {`
	`51`	`+ if let errorHandler = reportError {`
	`52`	`+ errorHandler(error)`
	`53`	`+ } else {`
	`54`	`+ throw error`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`	`}`
`54`	`58`	`}`