use FirebaseOptions extension for dummy config

russellwheatley · russellwheatley · commit d06bc07be30b · 2025-05-07T11:58:36.000+01:00
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/CommonUtils.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/CommonUtils.swift
@@ -47,8 +47,10 @@ public class CommonUtils {
     }
     return hash.map { String(format: "%02x", $0) }.joined()
   }
+}
 
-  public static func dummyConfigurationForPreview() {
+public extension FirebaseOptions {
+  static func dummyConfigurationForPreview() {
     guard FirebaseApp.app() == nil else { return }
 
     let options = FirebaseOptions(
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift
@@ -5,6 +5,7 @@
 //  Created by Russell Wheatley on 20/03/2025.
 //
 import FirebaseAuth
+import FirebaseCore
 import SwiftUI
 
 private enum FocusableField: Hashable {
@@ -134,7 +135,7 @@ extension EmailAuthView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return EmailAuthView()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift
@@ -1,4 +1,5 @@
 import FirebaseAuth
+import FirebaseCore
 import SwiftUI
 
 public struct EmailLinkView {
@@ -76,7 +77,7 @@ extension EmailLinkView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return EmailLinkView()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift
@@ -1,3 +1,4 @@
+import FirebaseCore
 import SwiftUI
 
 public struct PasswordRecoveryView {
@@ -69,7 +70,7 @@ extension PasswordRecoveryView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return PasswordRecoveryView()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift
@@ -1,3 +1,4 @@
+import FirebaseCore
 import SwiftUI
 
 @MainActor
@@ -45,7 +46,7 @@ extension SignedInView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return SignedInView()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/VerifyEmailView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/VerifyEmailView.swift
@@ -1,3 +1,4 @@
+import FirebaseCore
 import SwiftUI
 
 public struct VerifyEmailView {
@@ -44,7 +45,7 @@ extension VerifyEmailView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return VerifyEmailView()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift
@@ -3,6 +3,7 @@ import FacebookCore
 import FacebookLogin
 import FirebaseAuth
 import FirebaseAuthSwiftUI
+import FirebaseCore
 import SwiftUI
 
 @MainActor
@@ -110,7 +111,7 @@ extension SignInWithFacebookButton: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return SignInWithFacebookButton()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift
@@ -1,4 +1,5 @@
 import FirebaseAuthSwiftUI
+import FirebaseCore
 import SwiftUI
 
 @MainActor
@@ -51,7 +52,7 @@ extension SignInWithGoogleButton: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return SignInWithGoogleButton()
     .environment(AuthService())
 }
diff --git a/FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift b/FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift
@@ -1,4 +1,5 @@
 import FirebaseAuthSwiftUI
+import FirebaseCore
 import SwiftUI
 
 @MainActor
@@ -92,7 +93,7 @@ extension PhoneAuthButtonView: View {
 }
 
 #Preview {
-  CommonUtils.dummyConfigurationForPreview()
+  FirebaseOptions.dummyConfigurationForPreview()
   return PhoneAuthButtonView()
     .environment(AuthService())
 }

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,10 @@ public class CommonUtils {`
`47`	`47`	`}`
`48`	`48`	`return hash.map { String(format: "%02x", $0) }.joined()`
`49`	`49`	`}`
	`50`	`+}`
`50`	`51`
`51`		`- public static func dummyConfigurationForPreview() {`
	`52`	`+public extension FirebaseOptions {`
	`53`	`+ static func dummyConfigurationForPreview() {`
`52`	`54`	`guard FirebaseApp.app() == nil else { return }`
`53`	`55`
`54`	`56`	`let options = FirebaseOptions(`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// Created by Russell Wheatley on 20/03/2025.`
`6`	`6`	`//`
`7`	`7`	`import FirebaseAuth`
	`8`	`+import FirebaseCore`
`8`	`9`	`import SwiftUI`
`9`	`10`
`10`	`11`	`private enum FocusableField: Hashable {`
`@@ -134,7 +135,7 @@ extension EmailAuthView: View {`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`#Preview {`
`137`		`- CommonUtils.dummyConfigurationForPreview()`
	`138`	`+ FirebaseOptions.dummyConfigurationForPreview()`
`138`	`139`	`return EmailAuthView()`
`139`	`140`	`.environment(AuthService())`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import FirebaseAuth`
	`2`	`+import FirebaseCore`
`2`	`3`	`import SwiftUI`
`3`	`4`
`4`	`5`	`public struct EmailLinkView {`
`@@ -76,7 +77,7 @@ extension EmailLinkView: View {`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`#Preview {`
`79`		`- CommonUtils.dummyConfigurationForPreview()`
	`80`	`+ FirebaseOptions.dummyConfigurationForPreview()`
`80`	`81`	`return EmailLinkView()`
`81`	`82`	`.environment(AuthService())`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import FirebaseCore`
`1`	`2`	`import SwiftUI`
`2`	`3`
`3`	`4`	`public struct PasswordRecoveryView {`
`@@ -69,7 +70,7 @@ extension PasswordRecoveryView: View {`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`#Preview {`
`72`		`- CommonUtils.dummyConfigurationForPreview()`
	`73`	`+ FirebaseOptions.dummyConfigurationForPreview()`
`73`	`74`	`return PasswordRecoveryView()`
`74`	`75`	`.environment(AuthService())`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import FacebookCore`
`3`	`3`	`import FacebookLogin`
`4`	`4`	`import FirebaseAuth`
`5`	`5`	`import FirebaseAuthSwiftUI`
	`6`	`+import FirebaseCore`
`6`	`7`	`import SwiftUI`
`7`	`8`
`8`	`9`	`@MainActor`
`@@ -110,7 +111,7 @@ extension SignInWithFacebookButton: View {`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`#Preview {`
`113`		`- CommonUtils.dummyConfigurationForPreview()`
	`114`	`+ FirebaseOptions.dummyConfigurationForPreview()`
`114`	`115`	`return SignInWithFacebookButton()`
`115`	`116`	`.environment(AuthService())`
`116`	`117`	`}`