refactor: phone auth provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -29,7 +29,7 @@ public protocol DeleteUserSwift {
   @MainActor func deleteUser(user: User) async throws
 }
 
-public protocol PhoneAuthProviderAuthUIProtocol: AuthProviderSwift {
+public protocol PhoneAuthProviderSwift: AuthProviderSwift {
   @MainActor func verifyPhoneNumber(phoneNumber: String) async throws -> String
 }
 

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -18,18 +18,12 @@ import SwiftUI
 
 public typealias VerificationID = String
 
-public class PhoneAuthProviderAuthUI: PhoneAuthProviderAuthUIProtocol, AuthProviderUI {
-  public let id: String = "phone"
-  
-  public var provider: AuthProviderSwift { self }
-  
+public class PhoneProviderSwift: PhoneAuthProviderSwift {
   // Store verification details for the signIn method
   private var storedVerificationID: String?
   private var storedVerificationCode: String?
 
-  @MainActor public func authButton() -> AnyView {
-    AnyView(PhoneAuthButtonView())
-  }
+  public init() {}
 
   @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {
     return try await withCheckedThrowingContinuation { continuation in
@@ -43,20 +37,36 @@ public class PhoneAuthProviderAuthUI: PhoneAuthProviderAuthUIProtocol, AuthProvi
         }
     }
   }
-  
+
   // Set verification details before calling signIn
   public func setVerificationDetails(verificationID: String, verificationCode: String) {
-    self.storedVerificationID = verificationID
-    self.storedVerificationCode = verificationCode
+    storedVerificationID = verificationID
+    storedVerificationCode = verificationCode
   }
-  
+
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
     guard let verificationID = storedVerificationID,
           let verificationCode = storedVerificationCode else {
-      throw AuthServiceError.invalidPhoneAuthenticationArguments("please call setVerificationDetails() before creating Phone Auth credential")
+      throw AuthServiceError
+        .invalidPhoneAuthenticationArguments(
+          "please call setVerificationDetails() before creating Phone Auth credential"
+        )
     }
-    
+
     return PhoneAuthProvider.provider()
       .credential(withVerificationID: verificationID, verificationCode: verificationCode)
   }
 }
+
+public class PhoneAuthProviderAuthUI: AuthProviderUI {
+  public var provider: AuthProviderSwift
+  public let id: String = "phone.com"
+
+  public init(provider: PhoneAuthProviderSwift? = nil) {
+    self.provider = provider ?? PhoneProviderSwift()
+  }
+
+  @MainActor public func authButton() -> AnyView {
+    AnyView(PhoneAuthButtonView(phoneProvider: provider as! PhoneAuthProviderSwift))
+  }
+}

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift

@@ -19,15 +19,18 @@ import SwiftUI
 @MainActor
 public struct PhoneAuthButtonView {
   @Environment(AuthService.self) private var authService
+  let phoneProvider: PhoneAuthProviderSwift
 
-  public init() {}
+  public init(phoneProvider: PhoneAuthProviderSwift) {
+    self.phoneProvider = phoneProvider
+  }
 }
 
 extension PhoneAuthButtonView: View {
   public var body: some View {
     Button(action: {
       authService.registerModalView(for: .phoneAuth) {
-        AnyView(PhoneAuthView().environment(authService))
+        AnyView(PhoneAuthView(phoneProvider: phoneProvider).environment(authService))
       }
       authService.presentModal(for: .phoneAuth)
     }) {
@@ -44,6 +47,7 @@ extension PhoneAuthButtonView: View {
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  return PhoneAuthButtonView()
+  let phoneProvider = PhoneProviderSwift()
+  return PhoneAuthButtonView(phoneProvider: phoneProvider)
     .environment(AuthService())
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthView.swift

@@ -31,9 +31,11 @@ public struct PhoneAuthView {
   @State private var showVerificationCodeInput = false
   @State private var verificationCode = ""
   @State private var verificationID = ""
-  private let phoneProvider = PhoneAuthProviderAuthUI()
+  let phoneProvider: PhoneAuthProviderSwift
 
-  public init() {}
+  public init(phoneProvider: PhoneAuthProviderSwift) {
+    self.phoneProvider = phoneProvider
+  }
 }
 
 extension PhoneAuthView: View {
@@ -83,7 +85,11 @@ extension PhoneAuthView: View {
         Button(action: {
           Task {
             do {
-              phoneProvider.setVerificationDetails(
+              guard let phoneAuthProvider = phoneProvider as? PhoneProviderSwift else {
+                errorMessage = "Invalid phone provider"
+                return
+              }
+              phoneAuthProvider.setVerificationDetails(
                 verificationID: verificationID,
                 verificationCode: verificationCode
               )
@@ -117,6 +123,7 @@ extension PhoneAuthView: View {
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  return PhoneAuthView()
+  let phoneProvider = PhoneProviderSwift()
+  return PhoneAuthView(phoneProvider: phoneProvider)
     .environment(AuthService())
 }