refactor: make phone auth a sheet that presents over AuthPickerView

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -34,7 +34,6 @@ public enum AuthView {
   case authPicker
   case passwordRecovery
   case emailLink
-  case phoneAuth
   case updatePassword
 }
 
@@ -84,6 +83,44 @@ public final class AuthService {
   public var authenticationFlow: AuthenticationFlow = .login
   public var errorMessage = ""
   public let passwordPrompt: PasswordPromptCoordinator = .init()
+
+  // MARK: - AuthPickerView Modal APIs
+
+  public var isShowingAuthModal = false
+
+  public enum AuthModalContentType {
+    case phoneAuth
+  }
+
+  public var currentModal: AuthModalContentType?
+
+  public var authModalViewBuilderRegistry: [AuthModalContentType: () -> AnyView] = [:]
+
+  public func registerModalView(for type: AuthModalContentType, builder: @escaping () -> AnyView) {
+    authModalViewBuilderRegistry[type] = builder
+  }
+
+  public func viewForCurrentModal() -> AnyView? {
+    guard let type = currentModal,
+          let builder = authModalViewBuilderRegistry[type] else {
+      return nil
+    }
+    return builder()
+  }
+
+  public func presentModal(for type: AuthModalContentType) {
+    currentModal = type
+    isShowingAuthModal = true
+  }
+
+  public func dismissModal() {
+    isShowingAuthModal = false
+  }
+
+  // MARK: - End AuthPickerView Modal APIs
+
+  // MARK: - Provider APIs
+
   private var unsafeGoogleProvider: (any GoogleProviderAuthUIProtocol)?
   private var unsafeFacebookProvider: (any FacebookProviderAuthUIProtocol)?
   private var unsafePhoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
@@ -147,6 +184,8 @@ public final class AuthService {
     }
   }
 
+  // MARK: - End Provider APIs
+
   private func safeActionCodeSettings() throws -> ActionCodeSettings {
     // email sign-in requires action code settings
     guard let actionCodeSettings = configuration

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -11,6 +11,13 @@ public struct AuthPickerView {
     authService.authenticationFlow = authService
       .authenticationFlow == .login ? .signUp : .login
   }
+
+  private var isAuthModalPresented: Binding<Bool> {
+    Binding(
+      get: { authService.isShowingAuthModal },
+      set: { authService.isShowingAuthModal = $0 }
+    )
+  }
 }
 
 extension AuthPickerView: View {
@@ -28,8 +35,6 @@ extension AuthPickerView: View {
         } else if authService.authView == .emailLink {
           Divider()
           EmailLinkView()
-        } else if authService.authView == .phoneAuth {
-          // TODO: - how are we rendering the phone auth View??
         } else {
           Divider()
           if authService.emailSignInEnabled {
@@ -64,6 +69,33 @@ extension AuthPickerView: View {
           PrivacyTOCsView(displayMode: .footer)
           Text(authService.errorMessage).foregroundColor(.red)
         }
+      }.sheet(isPresented: isAuthModalPresented) {
+        VStack(spacing: 0) {
+          HStack {
+            Button(action: {
+              authService.dismissModal()
+            }) {
+              HStack(spacing: 4) {
+                Image(systemName: "chevron.left")
+                  .font(.system(size: 17, weight: .medium))
+                Text(authService.string.backButtonLabel)
+                  .font(.system(size: 17))
+              }
+              .foregroundColor(.blue)
+            }
+            Spacer()
+          }
+          .padding()
+          .background(Color(.systemBackground))
+
+          Divider()
+
+          if let view = authService.viewForCurrentModal() {
+            view
+              .frame(maxWidth: .infinity, maxHeight: .infinity)
+              .padding()
+          }
+        }
       }
     }
   }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -69,7 +69,7 @@ extension PasswordRecoveryView: View {
       }
       .padding()
     }.onOpenURL { _ in
-      // move the user to email/password View
+      // TODO: - move the user to email/password View
     }
     .navigationBarItems(leading: Button(action: {
       authService.authView = .authPicker

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift

@@ -12,7 +12,10 @@ public struct PhoneAuthButtonView {
 extension PhoneAuthButtonView: View {
   public var body: some View {
     Button(action: {
-      authService.authView = .phoneAuth
+      authService.registerModalView(for: .phoneAuth) {
+        AnyView(PhoneAuthView().environment(authService))
+      }
+      authService.presentModal(for: .phoneAuth)
     }) {
       Label("Sign in with Phone", systemImage: "phone.fill")
         .foregroundColor(.white)

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthView.swift

@@ -95,7 +95,6 @@ extension PhoneAuthView: View {
         .padding(.vertical, 8)
         .frame(maxWidth: .infinity)
     }
-    Text(errorMessage).foregroundColor(.red)
   }
 }