Merge branch 'refactor-remaining-packages' into apple-provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -109,42 +109,6 @@ public final class AuthService {
   private var currentMFAResolver: MultiFactorResolver?
   private var pendingMFACredential: AuthCredential?
 
-  // 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,
-                                @ViewBuilder 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 listenerManager: AuthListenerManager?

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -26,13 +26,6 @@ public struct AuthPickerView {
       .authenticationFlow == .signIn ? .signUp : .signIn
   }
 
-  private var isAuthModalPresented: Binding<Bool> {
-    Binding(
-      get: { authService.isShowingAuthModal },
-      set: { authService.isShowingAuthModal = $0 }
-    )
-  }
-
   @ViewBuilder
   private var authPickerTitleView: some View {
     if authService.authView == .authPicker {
@@ -103,33 +96,6 @@ extension AuthPickerView: View {
             EmptyView()
           }
         }
-      }.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/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -34,20 +34,34 @@ public class PhoneProviderSwift: PhoneAuthProviderSwift {
     }
   }
 
-  // Create a phone auth credential with the verification details
-  public func createPhoneAuthCredential(verificationID: String,
-                                        verificationCode: String) -> AuthCredential {
-    return PhoneAuthProvider.provider()
-      .credential(withVerificationID: verificationID, verificationCode: verificationCode)
-  }
-
-  // This method is required by the protocol but should not be used for phone auth
-  // Phone auth requires verification details, so use createPhoneAuthCredential instead
+  // Present phone auth UI and wait for user to complete the flow
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
-    throw AuthServiceError
-      .invalidPhoneAuthenticationArguments(
-        "Phone auth requires verification details. Use createPhoneAuthCredential(verificationID:verificationCode:) instead."
-      )
+    guard let presentingViewController = await (UIApplication.shared.connectedScenes
+      .first as? UIWindowScene)?.windows.first?.rootViewController else {
+      throw AuthServiceError
+        .invalidPhoneAuthenticationArguments(
+          "Root View controller is not available to present Phone auth View."
+        )
+    }
+
+    return try await withCheckedThrowingContinuation { continuation in
+      let phoneAuthView = PhoneAuthView(phoneProvider: self) { result in
+        switch result {
+        case let .success(verificationID, verificationCode):
+          // Create the credential here
+          let credential = PhoneAuthProvider.provider()
+            .credential(withVerificationID: verificationID, verificationCode: verificationCode)
+          continuation.resume(returning: credential)
+        case let .failure(error):
+          continuation.resume(throwing: error)
+        }
+      }
+
+      let hostingController = UIHostingController(rootView: phoneAuthView)
+      hostingController.modalPresentationStyle = .formSheet
+
+      presentingViewController.present(hostingController, animated: true)
+    }
   }
 }
 

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift

@@ -29,10 +29,9 @@ public struct PhoneAuthButtonView {
 extension PhoneAuthButtonView: View {
   public var body: some View {
     Button(action: {
-      authService.registerModalView(for: .phoneAuth) {
-        AnyView(PhoneAuthView(phoneProvider: phoneProvider).environment(authService))
+      Task {
+        try await authService.signIn(phoneProvider)
       }
-      authService.presentModal(for: .phoneAuth)
     }) {
       Label("Sign in with Phone", systemImage: "phone.fill")
         .foregroundColor(.white)