refactor: phone auth provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -36,6 +36,7 @@ public enum AuthServiceError: LocalizedError {
   case invalidCredentials(String)
   case signInFailed(underlying: Error)
   case accountMergeConflict(context: AccountMergeConflictContext)
+  case invalidPhoneAuthenticationArguments(String)
   case providerNotFound(String)
 
   public var errorDescription: String? {
@@ -58,6 +59,8 @@ public enum AuthServiceError: LocalizedError {
       return context.errorDescription
     case let .providerNotFound(description):
       return description
+    case let .invalidPhoneAuthenticationArguments(description):
+        return description
     }
   }
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -30,17 +30,6 @@ public class PhoneAuthProviderAuthUI: @preconcurrency PhoneAuthProviderAuthUIPro
   @MainActor public func authButton() -> AnyView {
     AnyView(PhoneAuthButtonView())
   }
-  
-  @MainActor public func createAuthCredential() async throws -> AuthCredential {
-    guard let verificationID = storedVerificationID,
-          let verificationCode = storedVerificationCode else {
-      fatalError("Phone authentication requires verifyPhoneNumber to be called first")
-    }
-    return PhoneAuthProvider.provider().credential(
-      withVerificationID: verificationID,
-      verificationCode: verificationCode
-    )
-  }
 
   @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {
     return try await withCheckedThrowingContinuation { continuation in
@@ -54,4 +43,20 @@ public class PhoneAuthProviderAuthUI: @preconcurrency PhoneAuthProviderAuthUIPro
         }
     }
   }
+  
+  // Set verification details before calling signIn
+  public func setVerificationDetails(verificationID: String, verificationCode: String) {
+    self.storedVerificationID = verificationID
+    self.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")
+    }
+    
+    return PhoneAuthProvider.provider()
+      .credential(withVerificationID: verificationID, verificationCode: verificationCode)
+  }
 }

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthView.swift

@@ -31,6 +31,7 @@ public struct PhoneAuthView {
   @State private var showVerificationCodeInput = false
   @State private var verificationCode = ""
   @State private var verificationID = ""
+  private let phoneProvider = PhoneAuthProviderAuthUI()
 
   public init() {}
 }
@@ -52,7 +53,7 @@ extension PhoneAuthView: View {
         Button(action: {
           Task {
             do {
-              let id = try await authService.verifyPhoneNumber(phoneNumber: phoneNumber)
+              let id = try await phoneProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
               verificationID = id
               showVerificationCodeInput = true
             } catch {
@@ -82,10 +83,11 @@ extension PhoneAuthView: View {
         Button(action: {
           Task {
             do {
-              try await authService.signInWithPhoneNumber(
+              phoneProvider.setVerificationDetails(
                 verificationID: verificationID,
                 verificationCode: verificationCode
               )
+              try await authService.signInWithProvider(phoneProvider)
             } catch {
               errorMessage = authService.string.localizedErrorMessage(for: error)
             }