refactor: email sign-in opt-in, remove providerButton closure

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -90,6 +90,8 @@ public final class AuthService {
   private var listenerManager: AuthListenerManager?
   private var signedInCredential: AuthCredential?
 
+  var emailSignInEnabled = false
+
   private var providers: [ExternalAuthProvider] = []
   public func register(provider: ExternalAuthProvider) {
     providers.append(provider)
@@ -256,6 +258,11 @@ public extension AuthService {
 // MARK: - Email/Password Sign In
 
 public extension AuthService {
+  func withEmailSignIn() -> AuthService {
+    emailSignInEnabled = true
+    return self
+  }
+
   func signIn(withEmail email: String, password: String) async throws {
     let credential = EmailAuthProvider.credential(withEmail: email, password: password)
     try await signIn(credentials: credential)

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/StringUtils.swift

@@ -308,12 +308,14 @@ public class StringUtils {
   public var enterPhoneNumberLabel: String {
     return localizedString(for: "Enter phone number")
   }
+
   /// Phone provider
   /// found in:
   /// - PhoneAuthButtonView
   public var phoneNumberVerificationCodeLabel: String {
     return localizedString(for: "Enter verification code")
   }
+
   /// Phone provider
   /// found in:
   /// - PhoneAuthButtonView

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -1,13 +1,10 @@
 import SwiftUI
 
 @MainActor
-public struct AuthPickerView<Content: View> {
+public struct AuthPickerView {
   @Environment(AuthService.self) private var authService
-  let providerButtons: () -> Content
 
-  public init(@ViewBuilder providerButtons: @escaping () -> Content) {
-    self.providerButtons = providerButtons
-  }
+  public init() {}
 
   private func switchFlow() {
     authService.authenticationFlow = authService
@@ -29,28 +26,32 @@ extension AuthPickerView: View {
       } else if authService.authView == .emailLink {
         EmailLinkView()
       } else {
-        Text(authService.authenticationFlow == .login ? authService.string
-          .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-        VStack { Divider() }
-        EmailAuthView()
+        if authService.emailSignInEnabled {
+          Text(authService.authenticationFlow == .login ? authService.string
+            .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+          VStack { Divider() }
+          EmailAuthView()
+        }
         authService.renderButtons()
-        VStack { Divider() }
-        HStack {
-          Text(authService
-            .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
-            authService.string.alreadyHaveAnAccountLabel)
-          Button(action: {
-            withAnimation {
-              switchFlow()
+        if authService.emailSignInEnabled {
+          VStack { Divider() }
+          HStack {
+            Text(authService
+              .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
+              authService.string.alreadyHaveAnAccountLabel)
+            Button(action: {
+              withAnimation {
+                switchFlow()
+              }
+            }) {
+              Text(authService.authenticationFlow == .signUp ? authService.string
+                .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+                .fontWeight(.semibold)
+                .foregroundColor(.blue)
             }
-          }) {
-            Text(authService.authenticationFlow == .signUp ? authService.string
-              .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-              .fontWeight(.semibold)
-              .foregroundColor(.blue)
           }
+          Text(authService.errorMessage).foregroundColor(.red)
         }
-        Text(authService.errorMessage).foregroundColor(.red)
       }
     }
   }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/ContentView.swift

@@ -34,11 +34,10 @@ struct ContentView: View {
     .withGoogleSignIn()
     .withFacebookSignIn()
     .withPhoneSignIn()
+    .withEmailSignIn()
   }
 
   var body: some View {
-    AuthPickerView {
-      PhoneAuthButtonView()
-    }.environment(authService)
+    AuthPickerView().environment(authService)
   }
 }