refactor: use typed provider to remove forced unwrapping

Author: russellwheatley

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift

@@ -140,15 +140,15 @@ public class AppleProviderSwift: CredentialAuthProviderSwift {
 }
 
 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 as! CredentialAuthProviderSwift))
+    AnyView(SignInWithAppleButton(provider: typedProvider))
   }
 }

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Views/SignInWithAppleButton.swift

@@ -20,8 +20,8 @@ import SwiftUI
 @MainActor
 public struct SignInWithAppleButton {
   @Environment(AuthService.self) private var authService
-  let provider: CredentialAuthProviderSwift
-  public init(provider: CredentialAuthProviderSwift) {
+  let provider: AppleProviderSwift
+  public init(provider: AppleProviderSwift) {
     self.provider = provider
   }
 }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -119,14 +119,15 @@ public class FacebookProviderSwift: CredentialAuthProviderSwift {
 }
 
 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))
   }
 }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift

@@ -22,9 +22,9 @@ import SwiftUI
 @MainActor
 public struct SignInWithFacebookButton {
   @Environment(AuthService.self) private var authService
-  let facebookProvider: CredentialAuthProviderSwift
+  let facebookProvider: FacebookProviderSwift
 
-  public init(facebookProvider: CredentialAuthProviderSwift) {
+  public init(facebookProvider: FacebookProviderSwift) {
     self.facebookProvider = facebookProvider
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -71,14 +71,15 @@ public class GoogleProviderSwift: CredentialAuthProviderSwift {
 }
 
 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 as! CredentialAuthProviderSwift))
+    AnyView(SignInWithGoogleButton(googleProvider: typedProvider))
   }
 }

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Views/SignInWithGoogleButton.swift

@@ -26,9 +26,9 @@ import SwiftUI
 @MainActor
 public struct SignInWithGoogleButton {
   @Environment(AuthService.self) private var authService
-  let googleProvider: CredentialAuthProviderSwift
+  let googleProvider: GoogleProviderSwift
 
-  public init(googleProvider: CredentialAuthProviderSwift) {
+  public init(googleProvider: GoogleProviderSwift) {
     self.googleProvider = googleProvider
   }
 }

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift.swift

@@ -116,20 +116,18 @@ public class OAuthProviderSwift: CredentialAuthProviderSwift {
 }
 
 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 as! CredentialAuthProviderSwift))
+    AnyView(GenericOAuthButton(provider: typedProvider))
   }
 }

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift

@@ -20,35 +20,28 @@ import SwiftUI
 @MainActor
 public struct GenericOAuthButton {
   @Environment(AuthService.self) private var authService
-  let provider: CredentialAuthProviderSwift
-  public init(provider: CredentialAuthProviderSwift) {
+  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 {
           try? await authService.signIn(provider)

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -43,14 +43,15 @@ public class PhoneProviderSwift: PhoneAuthProviderSwift {
 }
 
 public class PhoneAuthProviderAuthUI: AuthProviderUI {
-  public var provider: AuthProviderSwift
+  private let typedProvider: PhoneAuthProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "phone"
 
   public init(provider: PhoneAuthProviderSwift? = nil) {
-    self.provider = provider ?? PhoneProviderSwift()
+    typedProvider = provider ?? PhoneProviderSwift()
   }
 
   @MainActor public func authButton() -> AnyView {
-    AnyView(PhoneAuthButtonView(phoneProvider: provider as! PhoneAuthProviderSwift))
+    AnyView(PhoneAuthButtonView(phoneProvider: typedProvider))
   }
 }

FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/TwitterProviderAuthUI.swift

@@ -45,15 +45,15 @@ public class TwitterProviderSwift: CredentialAuthProviderSwift {
 }
 
 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 as! CredentialAuthProviderSwift))
+    AnyView(SignInWithTwitterButton(provider: typedProvider))
   }
 }