Merge branch 'development' into api-refactor

russellwheatley · russellwheatley · commit bc040dde598c · 2025-11-06T16:15:51.000Z
diff --git a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift
@@ -114,7 +114,7 @@ extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {
 
 // MARK: - Apple Provider Swift
 
-public class AppleProviderSwift: AuthProviderSwift {
+public class AppleProviderSwift: CredentialAuthProviderSwift {
   public let scopes: [ASAuthorization.Scope]
   let providerId = "apple.com"
 
@@ -140,15 +140,15 @@ public class AppleProviderSwift: AuthProviderSwift {
 }
 
 public class AppleProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: AppleProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
+  public let id: String = "apple.com"
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: AppleProviderSwift) {
+    typedProvider = provider
   }
 
-  public let id: String = "apple.com"
-
   @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithAppleButton(provider: provider))
+    AnyView(SignInWithAppleButton(provider: typedProvider))
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift
@@ -21,8 +21,8 @@ import SwiftUI
 public struct SignInWithAppleButton {
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
-  let provider: AuthProviderSwift
-  public init(provider: AuthProviderSwift) {
+  let provider: AppleProviderSwift
+  public init(provider: AppleProviderSwift) {
     self.provider = provider
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift
@@ -17,7 +17,12 @@ import FirebaseAuthUIComponents
 import FirebaseCore
 import SwiftUI
 
-public protocol AuthProviderSwift {
+/// Base protocol for all authentication providers
+public protocol AuthProviderSwift {}
+
+/// Protocol for providers that can directly create an AuthCredential
+/// Used by Google, Apple, Twitter, Facebook, and OAuth providers
+public protocol CredentialAuthProviderSwift: AuthProviderSwift {
   @MainActor func createAuthCredential() async throws -> AuthCredential
 }
 
@@ -27,12 +32,6 @@ public protocol AuthProviderUI {
   var provider: AuthProviderSwift { get }
 }
 
-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
@@ -148,10 +147,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)
   }
@@ -173,7 +168,7 @@ public final class AuthService {
     )
   }
 
-  public func signIn(_ provider: AuthProviderSwift) async throws -> SignInOutcome {
+  public func signIn(_ provider: CredentialAuthProviderSwift) async throws -> SignInOutcome {
     let credential = try await provider.createAuthCredential()
     let result = try await signIn(credentials: credential)
     return result
@@ -747,8 +742,15 @@ public extension AuthService {
       let password = try await passwordPrompt.confirmPassword()
       let credential = EmailAuthProvider.credential(withEmail: email, password: password)
       _ = try await user.reauthenticate(with: credential)
-    } else if let matchingProvider = providers.first(where: { $0.id == providerId }) {
-      let credential = try await matchingProvider.provider.createAuthCredential()
+    } else if providerId == PhoneAuthProviderID {
+      // Phone auth requires manual reauthentication via sign out and sign in otherwise it will take
+      // the user out of the existing flow
+      throw AuthServiceError.reauthenticationRequired(
+        "Phone authentication requires you to sign out and sign in again to continue"
+      )
+    } else if let matchingProvider = providers.first(where: { $0.id == providerId }),
+              let credentialProvider = matchingProvider.provider as? CredentialAuthProviderSwift {
+      let credential = try await credentialProvider.createAuthCredential()
       _ = try await user.reauthenticate(with: credential)
     } else {
       throw AuthServiceError.providerNotFound("No provider found for \(providerId)")
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift
@@ -49,11 +49,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
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift
@@ -53,15 +53,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 let caughtError {
               reportError(caughtError)
diff --git a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift
@@ -19,7 +19,7 @@ import FirebaseAuth
 import FirebaseAuthSwiftUI
 import SwiftUI
 
-public class FacebookProviderSwift: AuthProviderSwift {
+public class FacebookProviderSwift: CredentialAuthProviderSwift {
   let scopes: [String]
   let providerId = "facebook.com"
   private let loginManager = LoginManager()
@@ -119,14 +119,15 @@ public class FacebookProviderSwift: AuthProviderSwift {
 }
 
 public class FacebookProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: FacebookProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "facebook.com"
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: FacebookProviderSwift) {
+    typedProvider = provider
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithFacebookButton(facebookProvider: provider as! FacebookProviderSwift))
+    AnyView(SignInWithFacebookButton(facebookProvider: typedProvider))
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift
@@ -19,7 +19,7 @@ import GoogleSignIn
 import GoogleSignInSwift
 import SwiftUI
 
-public class GoogleProviderSwift: AuthProviderSwift {
+public class GoogleProviderSwift: CredentialAuthProviderSwift {
   let scopes: [String]
   let clientID: String
   let providerId = "google.com"
@@ -71,14 +71,15 @@ public class GoogleProviderSwift: AuthProviderSwift {
 }
 
 public class GoogleProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: GoogleProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "google.com"
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: GoogleProviderSwift) {
+    typedProvider = provider
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithGoogleButton(googleProvider: provider))
+    AnyView(SignInWithGoogleButton(googleProvider: typedProvider))
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift
@@ -27,9 +27,9 @@ import SwiftUI
 public struct SignInWithGoogleButton {
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
-  let googleProvider: AuthProviderSwift
+  let googleProvider: GoogleProviderSwift
 
-  public init(googleProvider: AuthProviderSwift) {
+  public init(googleProvider: GoogleProviderSwift) {
     self.googleProvider = googleProvider
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift.swift b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift.swift
@@ -18,7 +18,7 @@ import FirebaseCore
 import SwiftUI
 
 /// Configuration for a generic OAuth provider
-public class OAuthProviderSwift: AuthProviderSwift {
+public class OAuthProviderSwift: CredentialAuthProviderSwift {
   public let providerId: String
   public let scopes: [String]
   public let customParameters: [String: String]
@@ -116,20 +116,18 @@ public class OAuthProviderSwift: AuthProviderSwift {
 }
 
 public class OAuthProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: OAuthProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: OAuthProviderSwift) {
+    typedProvider = provider
   }
 
   public var id: String {
-    guard let oauthProvider = provider as? OAuthProviderSwift else {
-      return "oauth.unknown"
-    }
-    return oauthProvider.providerId
+    return typedProvider.providerId
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(GenericOAuthButton(provider: provider))
+    AnyView(GenericOAuthButton(provider: typedProvider))
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift
@@ -21,35 +21,28 @@ import SwiftUI
 public struct GenericOAuthButton {
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
-  let provider: AuthProviderSwift
-  public init(provider: AuthProviderSwift) {
+  let provider: OAuthProviderSwift
+  public init(provider: OAuthProviderSwift) {
     self.provider = provider
   }
 }
 
 extension GenericOAuthButton: View {
   public var body: some View {
-    guard let oauthProvider = provider as? OAuthProviderSwift else {
-      return AnyView(
-        Text(authService.string.invalidOAuthProviderError)
-          .foregroundColor(.red)
-      )
-    }
-
     // Create custom style from provider configuration
     var resolvedStyle: ProviderStyle {
       ProviderStyle(
-        icon: oauthProvider.buttonIcon,
-        backgroundColor: oauthProvider.buttonBackgroundColor,
-        contentColor: oauthProvider.buttonForegroundColor
+        icon: provider.buttonIcon,
+        backgroundColor: provider.buttonBackgroundColor,
+        contentColor: provider.buttonForegroundColor
       )
     }
 
     return AnyView(
       AuthProviderButton(
-        label: oauthProvider.displayName,
+        label: provider.displayName,
         style: resolvedStyle,
-        accessibilityId: "sign-in-with-\(oauthProvider.providerId)-button"
+        accessibilityId: "sign-in-with-\(provider.providerId)-button"
       ) {
         Task {
           do {
diff --git a/FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift b/FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift
@@ -12,49 +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() async throws -> AuthCredential {
-    fatalError("Not implemented")
-  }
-
-  @MainActor public func createAuthCredential(verificationId: String,
-                                              verificationCode: String) async throws
-    -> AuthCredential {
-    return PhoneAuthProvider.provider()
-      .credential(withVerificationID: verificationId, verificationCode: verificationCode)
-  }
 }
 
 public class PhoneAuthProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: PhoneProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "phone"
 
-  public init(provider: PhoneAuthProviderSwift? = nil) {
-    self.provider = provider ?? PhoneProviderSwift()
+  public init() {
+    typedProvider = PhoneProviderSwift()
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(PhoneAuthButtonView(phoneProvider: provider as! PhoneAuthProviderSwift))
+    AnyView(PhoneAuthButtonView())
   }
 }
diff --git a/FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift b/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())
 }
diff --git a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/TwitterProviderAuthUI.swift b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/TwitterProviderAuthUI.swift
@@ -17,7 +17,7 @@ import FirebaseAuthSwiftUI
 import FirebaseCore
 import SwiftUI
 
-public class TwitterProviderSwift: AuthProviderSwift {
+public class TwitterProviderSwift: CredentialAuthProviderSwift {
   public let scopes: [String]
   let providerId = "twitter.com"
 
@@ -45,15 +45,15 @@ public class TwitterProviderSwift: AuthProviderSwift {
 }
 
 public class TwitterProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: TwitterProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
+  public let id: String = "twitter.com"
 
-  public init(provider: AuthProviderSwift) {
-    self.provider = provider
+  public init(provider: TwitterProviderSwift) {
+    typedProvider = provider
   }
 
-  public let id: String = "twitter.com"
-
   @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithTwitterButton(provider: provider))
+    AnyView(SignInWithTwitterButton(provider: typedProvider))
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Views/SignInWithTwitterButton.swift

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {`
`114`	`114`
`115`	`115`	`// MARK: - Apple Provider Swift`
`116`	`116`
`117`		`-public class AppleProviderSwift: AuthProviderSwift {`
	`117`	`+public class AppleProviderSwift: CredentialAuthProviderSwift {`
`118`	`118`	`public let scopes: [ASAuthorization.Scope]`
`119`	`119`	`let providerId = "apple.com"`
`120`	`120`
`@@ -140,15 +140,15 @@ public class AppleProviderSwift: AuthProviderSwift {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public class AppleProviderAuthUI: AuthProviderUI {`
`143`		`- public var provider: AuthProviderSwift`
	`143`	`+ private let typedProvider: AppleProviderSwift`
	`144`	`+ public var provider: AuthProviderSwift { typedProvider }`
	`145`	`+ public let id: String = "apple.com"`
`144`	`146`
`145`		`- public init(provider: AuthProviderSwift) {`
`146`		`- self.provider = provider`
	`147`	`+ public init(provider: AppleProviderSwift) {`
	`148`	`+ typedProvider = provider`
`147`	`149`	`}`
`148`	`150`
`149`		`- public let id: String = "apple.com"`
`150`		`-`
`151`	`151`	`@MainActor public func authButton() -> AnyView {`
`152`		`- AnyView(SignInWithAppleButton(provider: provider))`
	`152`	`+ AnyView(SignInWithAppleButton(provider: typedProvider))`
`153`	`153`	`}`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import SwiftUI`
`21`	`21`	`public struct SignInWithAppleButton {`
`22`	`22`	`@Environment(AuthService.self) private var authService`
`23`	`23`	`@Environment(\.reportError) private var reportError`
`24`		`- let provider: AuthProviderSwift`
`25`		`- public init(provider: AuthProviderSwift) {`
	`24`	`+ let provider: AppleProviderSwift`
	`25`	`+ public init(provider: AppleProviderSwift) {`
`26`	`26`	`self.provider = provider`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import FirebaseAuth`
`19`	`19`	`import FirebaseAuthSwiftUI`
`20`	`20`	`import SwiftUI`
`21`	`21`
`22`		`-public class FacebookProviderSwift: AuthProviderSwift {`
	`22`	`+public class FacebookProviderSwift: CredentialAuthProviderSwift {`
`23`	`23`	`let scopes: [String]`
`24`	`24`	`let providerId = "facebook.com"`
`25`	`25`	`private let loginManager = LoginManager()`
`@@ -119,14 +119,15 @@ public class FacebookProviderSwift: AuthProviderSwift {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public class FacebookProviderAuthUI: AuthProviderUI {`
`122`		`- public var provider: AuthProviderSwift`
	`122`	`+ private let typedProvider: FacebookProviderSwift`
	`123`	`+ public var provider: AuthProviderSwift { typedProvider }`
`123`	`124`	`public let id: String = "facebook.com"`
`124`	`125`
`125`		`- public init(provider: AuthProviderSwift) {`
`126`		`- self.provider = provider`
	`126`	`+ public init(provider: FacebookProviderSwift) {`
	`127`	`+ typedProvider = provider`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`@MainActor public func authButton() -> AnyView {`
`130`		`- AnyView(SignInWithFacebookButton(facebookProvider: provider as! FacebookProviderSwift))`
	`131`	`+ AnyView(SignInWithFacebookButton(facebookProvider: typedProvider))`
`131`	`132`	`}`
`132`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import GoogleSignIn`
`19`	`19`	`import GoogleSignInSwift`
`20`	`20`	`import SwiftUI`
`21`	`21`
`22`		`-public class GoogleProviderSwift: AuthProviderSwift {`
	`22`	`+public class GoogleProviderSwift: CredentialAuthProviderSwift {`
`23`	`23`	`let scopes: [String]`
`24`	`24`	`let clientID: String`
`25`	`25`	`let providerId = "google.com"`
`@@ -71,14 +71,15 @@ public class GoogleProviderSwift: AuthProviderSwift {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public class GoogleProviderAuthUI: AuthProviderUI {`
`74`		`- public var provider: AuthProviderSwift`
	`74`	`+ private let typedProvider: GoogleProviderSwift`
	`75`	`+ public var provider: AuthProviderSwift { typedProvider }`
`75`	`76`	`public let id: String = "google.com"`
`76`	`77`
`77`		`- public init(provider: AuthProviderSwift) {`
`78`		`- self.provider = provider`
	`78`	`+ public init(provider: GoogleProviderSwift) {`
	`79`	`+ typedProvider = provider`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`@MainActor public func authButton() -> AnyView {`
`82`		`- AnyView(SignInWithGoogleButton(googleProvider: provider))`
	`83`	`+ AnyView(SignInWithGoogleButton(googleProvider: typedProvider))`
`83`	`84`	`}`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ import SwiftUI`
`27`	`27`	`public struct SignInWithGoogleButton {`
`28`	`28`	`@Environment(AuthService.self) private var authService`
`29`	`29`	`@Environment(\.reportError) private var reportError`
`30`		`- let googleProvider: AuthProviderSwift`
	`30`	`+ let googleProvider: GoogleProviderSwift`
`31`	`31`
`32`		`- public init(googleProvider: AuthProviderSwift) {`
	`32`	`+ public init(googleProvider: GoogleProviderSwift) {`
`33`	`33`	`self.googleProvider = googleProvider`
`34`	`34`	`}`
`35`	`35`	`}`