chore: implement displayName for friendly provider messages

Author: russellwheatley

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift

@@ -143,6 +143,7 @@ public class AppleProviderAuthUI: AuthProviderUI {
   private let typedProvider: AppleProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "apple.com"
+  public let displayName: String = "Apple"
 
   public init(provider: AppleProviderSwift) {
     typedProvider = provider

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -28,6 +28,7 @@ public protocol CredentialAuthProviderSwift: AuthProviderSwift {
 
 public protocol AuthProviderUI {
   var id: String { get }
+  var displayName: String { get }
   @MainActor func authButton() -> AnyView
   var provider: AuthProviderSwift { get }
 }
@@ -776,9 +777,19 @@ public extension AuthService {
   /// - Throws: Appropriate `AuthServiceError` based on the provider type
   private func requireReauthentication() async throws -> Never {
     let providerId = try await getCurrentSignInProvider()
+    
+    // Try to find display name from registered provider
+    let providerDisplayName: String
+    if let registeredProvider = providers.first(where: { $0.id == providerId }) {
+      providerDisplayName = registeredProvider.displayName
+    } else {
+      // Fallback for built-in providers (email/password) that don't have AuthProviderUI
+      providerDisplayName = getProviderDisplayName(providerId)
+    }
+    
     let context = ReauthContext(
       providerId: providerId,
-      providerName: getProviderDisplayName(providerId),
+      providerName: providerDisplayName,
       phoneNumber: currentUser?.phoneNumber,
       email: currentUser?.email
     )
@@ -824,7 +835,8 @@ public extension AuthService {
     return providerId
   }
 
-  /// Get a user-friendly display name for a provider ID
+  /// Get a user-friendly display name for built-in providers without AuthProviderUI
+  /// (email/password). Other providers should be registered and provide their own display names.
   /// - Parameter providerId: The provider ID from Firebase Auth
   /// - Returns: A user-friendly name for the provider
   private func getProviderDisplayName(_ providerId: String) -> String {
@@ -833,15 +845,8 @@ public extension AuthService {
       return "Email"
     case PhoneAuthProviderID:
       return "Phone"
-    case "google.com":
-      return "Google"
-    case "apple.com":
-      return "Apple"
-    case "facebook.com":
-      return "Facebook"
-    case "twitter.com":
-      return "Twitter"
     default:
+      // Shouldn't reach here if provider is registered
       return providerId
     }
   }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -122,6 +122,7 @@ public class FacebookProviderAuthUI: AuthProviderUI {
   private let typedProvider: FacebookProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "facebook.com"
+  public let displayName: String = "Facebook"
 
   public init(provider: FacebookProviderSwift) {
     typedProvider = provider

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -74,6 +74,7 @@ public class GoogleProviderAuthUI: AuthProviderUI {
   private let typedProvider: GoogleProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "google.com"
+  public let displayName: String = "Google"
 
   public init(provider: GoogleProviderSwift) {
     typedProvider = provider

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift+Presets.swift

@@ -25,7 +25,8 @@ public extension OAuthProviderSwift {
     return OAuthProviderSwift(
       providerId: "github.com",
       scopes: scopes,
-      displayName: "Sign in with GitHub",
+      buttonLabel: "Sign in with GitHub",
+      displayName: "GitHub",
       buttonIcon: ProviderStyle.github.icon!,
       buttonBackgroundColor: ProviderStyle.github.backgroundColor,
       buttonForegroundColor: ProviderStyle.github.contentColor
@@ -41,7 +42,8 @@ public extension OAuthProviderSwift {
       providerId: "microsoft.com",
       scopes: scopes,
       customParameters: ["prompt": "consent"],
-      displayName: "Sign in with Microsoft",
+      buttonLabel: "Sign in with Microsoft",
+      displayName: "Microsoft",
       buttonIcon: ProviderStyle.microsoft.icon!,
       buttonBackgroundColor: ProviderStyle.microsoft.backgroundColor,
       buttonForegroundColor: ProviderStyle.microsoft.contentColor
@@ -57,7 +59,8 @@ public extension OAuthProviderSwift {
       providerId: "yahoo.com",
       scopes: scopes,
       customParameters: ["prompt": "consent"],
-      displayName: "Sign in with Yahoo",
+      buttonLabel: "Sign in with Yahoo",
+      displayName: "Yahoo",
       buttonIcon: ProviderStyle.yahoo.icon!,
       buttonBackgroundColor: ProviderStyle.yahoo.backgroundColor,
       buttonForegroundColor: ProviderStyle.yahoo.contentColor

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift.swift

@@ -23,6 +23,7 @@ public class OAuthProviderSwift: CredentialAuthProviderSwift {
   public let scopes: [String]
   public let customParameters: [String: String]
   // Button appearance
+  public let buttonLabel: String
   public let displayName: String
   public let buttonIcon: Image
   public let buttonBackgroundColor: Color
@@ -32,20 +33,23 @@ public class OAuthProviderSwift: CredentialAuthProviderSwift {
   ///   - providerId: The OAuth provider ID (e.g., "github.com", "microsoft.com")
   ///   - scopes: OAuth scopes to request
   ///   - customParameters: Additional OAuth parameters
-  ///   - displayName: Button label (e.g., "Sign in with GitHub")
+  ///   - buttonLabel: Full button label (e.g., "Sign in with GitHub")
+  ///   - displayName: Short provider name for messages (e.g., "GitHub")
   ///   - buttonIcon: Button icon image
   ///   - buttonBackgroundColor: Button background color
   ///   - buttonForegroundColor: Button text/icon color
   public init(providerId: String,
               scopes: [String] = [],
               customParameters: [String: String] = [:],
+              buttonLabel: String,
               displayName: String,
               buttonIcon: Image,
               buttonBackgroundColor: Color = .black,
               buttonForegroundColor: Color = .white) {
     self.providerId = providerId
     self.scopes = scopes
     self.customParameters = customParameters
+    self.buttonLabel = buttonLabel
     self.displayName = displayName
     self.buttonIcon = buttonIcon
     self.buttonBackgroundColor = buttonBackgroundColor
@@ -57,13 +61,15 @@ public class OAuthProviderSwift: CredentialAuthProviderSwift {
   ///   - providerId: The OAuth provider ID (e.g., "github.com", "microsoft.com")
   ///   - scopes: OAuth scopes to request
   ///   - customParameters: Additional OAuth parameters
-  ///   - displayName: Button label (e.g., "Sign in with GitHub")
+  ///   - buttonLabel: Full button label (e.g., "Sign in with GitHub")
+  ///   - displayName: Short provider name for messages (e.g., "GitHub")
   ///   - iconSystemName: SF Symbol name
   ///   - buttonBackgroundColor: Button background color
   ///   - buttonForegroundColor: Button text/icon color
   public convenience init(providerId: String,
                           scopes: [String] = [],
                           customParameters: [String: String] = [:],
+                          buttonLabel: String,
                           displayName: String,
                           iconSystemName: String,
                           buttonBackgroundColor: Color = .black,
@@ -72,6 +78,7 @@ public class OAuthProviderSwift: CredentialAuthProviderSwift {
       providerId: providerId,
       scopes: scopes,
       customParameters: customParameters,
+      buttonLabel: buttonLabel,
       displayName: displayName,
       buttonIcon: Image(systemName: iconSystemName),
       buttonBackgroundColor: buttonBackgroundColor,
@@ -127,6 +134,10 @@ public class OAuthProviderAuthUI: AuthProviderUI {
     return typedProvider.providerId
   }
 
+  public var displayName: String {
+    return typedProvider.displayName
+  }
+
   @MainActor public func authButton() -> AnyView {
     AnyView(GenericOAuthButton(provider: typedProvider))
   }

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Views/GenericOAuthButton.swift

@@ -42,7 +42,7 @@ extension GenericOAuthButton: View {
 
     return AnyView(
       AuthProviderButton(
-        label: provider.displayName,
+        label: provider.buttonLabel,
         style: resolvedStyle,
         accessibilityId: "sign-in-with-\(provider.providerId)-button"
       ) {

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -24,6 +24,7 @@ public class PhoneAuthProviderAuthUI: AuthProviderUI {
   private let typedProvider: PhoneProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "phone"
+  public let displayName: String = "Phone"
 
   // Callback for when the phone auth button is tapped
   private let onTap: () -> Void

FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/TwitterProviderAuthUI.swift

@@ -48,6 +48,7 @@ public class TwitterProviderAuthUI: AuthProviderUI {
   private let typedProvider: TwitterProviderSwift
   public var provider: AuthProviderSwift { typedProvider }
   public let id: String = "twitter.com"
+  public let displayName: String = "Twitter"
 
   public init(provider: TwitterProviderSwift) {
     typedProvider = provider