refactor: change provider name, and add 2 views

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/AuthEnvironment.swift

@@ -52,13 +52,13 @@ final class AuthListenerManager {
 @MainActor
 @Observable
 public final class AuthEnvironment {
-  public let configuation: AuthConfiguration
+  public let configuration: AuthConfiguration
   public let auth: Auth
   private var listenerManager: AuthListenerManager?
 
   public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth()) {
     self.auth = auth
-    configuation = configuration
+    self.configuration = configuration
     listenerManager = AuthListenerManager(auth: auth, authEnvironment: self)
   }
 

…AuthSwiftUI/Services/EmailProvider.swift …Services/EmailPasswordAuthProvider.swiftFirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/EmailProvider.swift renamed to FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/EmailPasswordAuthProvider.swift FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/EmailProvider.swift renamed to FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/EmailPasswordAuthProvider.swift

@@ -2,7 +2,7 @@
 import SwiftUI
 
 @MainActor
-public class EmailAuthProvider {
+public class EmailPasswordAuthProvider {
   private let authEnvironment: AuthEnvironment
 
   public init(authEnvironment: AuthEnvironment) {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/AuthPickerView.swift

@@ -0,0 +1,16 @@
+import SwiftUI
+
+public struct AuthPickerView<Content: View>: View {
+  @Environment(AuthEnvironment.self) private var authEnvironment
+  let providerButtons: () -> Content
+
+  public init(@ViewBuilder providerButtons: @escaping () -> Content) {
+    self.providerButtons = providerButtons
+  }
+
+  public var body: some View {
+    VStack {
+      providerButtons()
+    }
+  }
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/AuthenticationScreen.swift

@@ -21,7 +21,7 @@ extension AuthenticationScreen: View {
         SignedInView()
       } else {
         Text(authEnvironment.authenticationFlow == .login ? "Login" : "Sign up")
-        EmailPasswordView(provider: EmailAuthProvider(authEnvironment: authEnvironment))
+        EmailPasswordView(provider: EmailPasswordAuthProvider(authEnvironment: authEnvironment))
         HStack {
           Text(authEnvironment
             .authenticationFlow == .login ? "Don't have an account yet?" :

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/EmailPasswordButtonView.swift

@@ -0,0 +1,16 @@
+import SwiftUI
+
+public struct EmailPasswordButtonView: View {
+  @Environment(AuthEnvironment.self) private var authEnvironment
+  private var provider: EmailPasswordAuthProvider
+  public init(provider: EmailPasswordAuthProvider) {
+    self.provider = provider
+  }
+
+  public var body: some View {
+    NavigationLink(destination: EmailPasswordView(provider: provider)
+      .environment(authEnvironment)) {
+        Text("Sign in with email")
+      }
+  }
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/EmailPasswordView.swift

@@ -17,15 +17,15 @@ public struct EmailPasswordView {
   @Environment(AuthEnvironment.self) private var authEnvironment
   @Environment(\.dismiss) private var dismiss
 
-  @State private var provider: EmailAuthProvider
+  private var provider: EmailPasswordAuthProvider
 
   @State private var email = ""
   @State private var password = ""
   @State private var confirmPassword = ""
 
   @FocusState private var focus: FocusableField?
 
-  public init(provider: EmailAuthProvider) {
+  public init(provider: EmailPasswordAuthProvider) {
     self.provider = provider
   }
 

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExampleApp.swift

@@ -15,16 +15,29 @@ import SwiftUI
 struct FirebaseSwiftUIExampleApp: App {
   init() {
     FirebaseApp.configure()
-    authViewModel = AuthEnvironment()
   }
 
-  let authViewModel: AuthEnvironment
-
   var body: some Scene {
     WindowGroup {
       NavigationView {
-        AuthenticationScreen().environment(authViewModel)
+        ContentView()
       }
     }
   }
 }
+
+struct ContentView: View {
+  let authEnvironment: AuthEnvironment
+  let emailAuthProvider: EmailPasswordAuthProvider
+
+  init() {
+    authEnvironment = AuthEnvironment()
+    emailAuthProvider = EmailPasswordAuthProvider(authEnvironment: authEnvironment)
+  }
+
+  var body: some View {
+    AuthPickerView {
+      EmailPasswordButtonView(provider: emailAuthProvider)
+    }.environment(authEnvironment)
+  }
+}