refactor: remove duplicate code for phone sign-in

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -32,15 +32,6 @@ public protocol AuthProviderUI {
   var provider: AuthProviderSwift { get }
 }
 
-/// Protocol for phone authentication which requires a two-step flow:
-/// 1. Verify phone number to get verification ID
-/// 2. Create credential with verification ID and code
-public protocol PhoneAuthProviderSwift: AuthProviderSwift {
-  @MainActor func verifyPhoneNumber(phoneNumber: String) async throws -> String
-  @MainActor func createAuthCredential(verificationId: String,
-                                       verificationCode: String) async throws -> AuthCredential
-}
-
 public enum AuthenticationState {
   case unauthenticated
   case authenticating
@@ -172,10 +163,6 @@ public final class AuthService {
 
   private var providers: [AuthProviderUI] = []
 
-  public var currentPhoneProvider: PhoneAuthProviderSwift? {
-    providers.compactMap { $0.provider as? PhoneAuthProviderSwift }.first
-  }
-
   public func registerProvider(providerWithButton: AuthProviderUI) {
     providers.append(providerWithButton)
   }
@@ -209,11 +196,6 @@ public final class AuthService {
     }
   }
 
-  public func signIn(_: PhoneAuthProviderSwift) async {
-    // Phone auth is multi-step, navigate to phone number entry
-    navigator.push(.enterPhoneNumber)
-  }
-
   // MARK: - End Provider APIs
 
   private func safeActionCodeSettings() throws -> ActionCodeSettings {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift

@@ -48,11 +48,8 @@ struct EnterPhoneNumberView: View {
       Button(action: {
         Task {
           do {
-            guard let provider = authService.currentPhoneProvider else {
-              fatalError("No phone provider found")
-            }
             let fullPhoneNumber = selectedCountry.dialCode + phoneNumber
-            let id = try await provider.verifyPhoneNumber(phoneNumber: fullPhoneNumber)
+            let id = try await authService.verifyPhoneNumber(phoneNumber: fullPhoneNumber)
             authService.navigator.push(.enterVerificationCode(
               verificationID: id,
               fullPhoneNumber: fullPhoneNumber

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift

@@ -52,15 +52,10 @@ struct EnterVerificationCodeView: View {
         Button(action: {
           Task {
             do {
-              guard let provider = authService.currentPhoneProvider else {
-                fatalError("No phone provider found")
-              }
-              let credential = try await provider.createAuthCredential(
-                verificationId: verificationID,
+              try await authService.signInWithPhoneNumber(
+                verificationID: verificationID,
                 verificationCode: verificationCode
               )
-
-              _ = try await authService.signIn(credentials: credential)
               authService.navigator.clear()
             } catch {}
           }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -12,46 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-@preconcurrency import FirebaseAuth
 import FirebaseAuthSwiftUI
 import SwiftUI
 
-public typealias VerificationID = String
-
-public class PhoneProviderSwift: PhoneAuthProviderSwift {
+/// Simple provider marker for phone authentication
+public class PhoneProviderSwift: AuthProviderSwift {
   public init() {}
-
-  @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {
-    return try await withCheckedThrowingContinuation { continuation in
-      PhoneAuthProvider.provider()
-        .verifyPhoneNumber(phoneNumber, uiDelegate: nil) { verificationID, error in
-          if let error = error {
-            continuation.resume(throwing: error)
-            return
-          }
-          continuation.resume(returning: verificationID!)
-        }
-    }
-  }
-
-  @MainActor public func createAuthCredential(verificationId: String,
-                                              verificationCode: String) async throws
-    -> AuthCredential {
-    return PhoneAuthProvider.provider()
-      .credential(withVerificationID: verificationId, verificationCode: verificationCode)
-  }
 }
 
 public class PhoneAuthProviderAuthUI: AuthProviderUI {
-  private let typedProvider: PhoneAuthProviderSwift
+  private let typedProvider: PhoneProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "phone"
 
-  public init(provider: PhoneAuthProviderSwift? = nil) {
-    typedProvider = provider ?? PhoneProviderSwift()
+  public init() {
+    typedProvider = PhoneProviderSwift()
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(PhoneAuthButtonView(phoneProvider: typedProvider))
+    AnyView(PhoneAuthButtonView())
   }
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift

@@ -20,11 +20,8 @@ import SwiftUI
 @MainActor
 public struct PhoneAuthButtonView {
   @Environment(AuthService.self) private var authService
-  let phoneProvider: PhoneAuthProviderSwift
 
-  public init(phoneProvider: PhoneAuthProviderSwift) {
-    self.phoneProvider = phoneProvider
-  }
+  public init() {}
 }
 
 extension PhoneAuthButtonView: View {
@@ -41,7 +38,6 @@ extension PhoneAuthButtonView: View {
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  let phoneProvider = PhoneProviderSwift()
-  return PhoneAuthButtonView(phoneProvider: phoneProvider)
+  return PhoneAuthButtonView()
     .environment(AuthService())
 }