ViewBuilder example

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -2,7 +2,9 @@
 import SwiftUI
 
 public protocol ExternalAuthProvider {
-  var id: String { get } 
+  var id: String { get }
+  associatedtype ButtonType: View
+  @MainActor @ViewBuilder func authButtonView() -> ButtonType
   @MainActor func authButton() -> AnyView
 }
 
@@ -65,15 +67,9 @@ private final class AuthListenerManager {
 @MainActor
 @Observable
 public final class AuthService {
-  public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth(),
-              googleProvider: (any GoogleProviderProtocol)? = nil,
-              facebookProvider: (any FacebookProviderProtocol)? = nil,
-              phoneAuthProvider: (any PhoneAuthProviderProtocol)? = nil) {
+  public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth()) {
     self.auth = auth
     self.configuration = configuration
-    self.googleProvider = googleProvider
-    self.facebookProvider = facebookProvider
-    self.phoneAuthProvider = phoneAuthProvider
     string = StringUtils(bundle: configuration.customStringsBundle ?? Bundle.module)
     listenerManager = AuthListenerManager(auth: auth, authEnvironment: self)
   }
@@ -96,8 +92,8 @@ public final class AuthService {
   private var listenerManager: AuthListenerManager?
   private var signedInCredential: AuthCredential?
 
-  private var providers: [ExternalAuthProvider] = []
-  public func register(provider: ExternalAuthProvider) {
+  private var providers: [any ExternalAuthProvider] = []
+  public func register(provider: any ExternalAuthProvider) {
     providers.append(provider)
   }
 
@@ -111,6 +107,25 @@ public final class AuthService {
     )
   }
 
+  @ViewBuilder
+  public var googleButton: some View {
+    if googleProvider != nil {
+      // For purpose of demonstration
+      // This produces "Type 'any View' cannot conform to 'View'"
+      googleProvider!.authButtonView()
+    } else {
+      EmptyView()
+    }
+  }
+
+//  public func renderButtonViews(spacing: CGFloat = 16) -> some View {
+//    VStack(spacing: spacing) {
+//      ForEach(providers, id: \.id) { provider in
+//        provider.authButtonView()
+//      }
+//    }
+//  }
+
   private var safeGoogleProvider: any GoogleProviderProtocol {
     get throws {
       guard let provider = googleProvider else {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -28,7 +28,7 @@ extension AuthPickerView: View {
         Text(authService.authenticationFlow == .login ? "Login" : "Sign up")
         VStack { Divider() }
         EmailAuthView()
-        authService.renderButtons()
+
         VStack { Divider() }
         HStack {
           Text(authService

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderSwift.swift

@@ -35,11 +35,15 @@ public class FacebookProviderSwift: FacebookProviderProtocol {
     rawNonce = CommonUtils.randomNonce()
     shaNonce = CommonUtils.sha256Hash(of: rawNonce)
   }
-  
+
   @MainActor public func authButton() -> AnyView {
     AnyView(SignInWithFacebookButton())
   }
 
+  @MainActor @ViewBuilder public func authButtonView() -> some View {
+    SignInWithFacebookButton()
+  }
+
   @MainActor public func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential {
     let trackingStatus = ATTrackingManager.trackingAuthorizationStatus
     let tracking: LoginTracking = trackingStatus != .authorized ? .limited :

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderSwift.swift

@@ -34,6 +34,14 @@ public class GoogleProviderSwift: @preconcurrency GoogleProviderProtocol {
     })
   }
 
+  @MainActor @ViewBuilder public func authButtonView() -> some View {
+    GoogleSignInButton {
+      Task {
+        try await self.signInWithGoogle(clientID: self.clientID)
+      }
+    }
+  }
+
   @MainActor public func signInWithGoogle(clientID: String) async throws -> AuthCredential {
     guard let presentingViewController = await (UIApplication.shared.connectedScenes
       .first as? UIWindowScene)?.windows.first?.rootViewController else {

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderSwift.swift

@@ -7,11 +7,15 @@ public typealias VerificationID = String
 public class PhoneAuthProviderSwift: @preconcurrency PhoneAuthProviderProtocol {
   public let id: String = "phone"
   public init() {}
-  
+
   @MainActor public func authButton() -> AnyView {
     AnyView(Text("phone button TODO"))
   }
 
+  @MainActor @ViewBuilder public func authButtonView() -> some View {
+    Text("phone button TODO")
+  }
+
   @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {
     return try await withCheckedThrowingContinuation { continuation in
       PhoneAuthProvider.provider()

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExampleApp.swift

@@ -91,12 +91,9 @@ struct ContentView: View {
       shouldAutoUpgradeAnonymousUsers: true,
       emailLinkSignInActionCodeSettings: actionCodeSettings
     )
-    let facebookProvider = FacebookProviderSwift()
-    let phoneAuthProvider = PhoneAuthProviderSwift()
+
     authService = AuthService(
-      configuration: configuration,
-      facebookProvider: facebookProvider,
-      phoneAuthProvider: phoneAuthProvider
+      configuration: configuration
     )
     // Transition to this api
     .withGoogleSignIn()