refactor: facebook provider

Author: russellwheatley

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift

@@ -24,7 +24,7 @@ import FirebaseAuthSwiftUI
 import Observation
 
 protocol FacebookOperationReauthentication {
-  var facebookProvider: FacebookProviderAuthUI { get }
+  var facebookProvider: FacebookProviderSwift { get }
 }
 
 extension FacebookOperationReauthentication {
@@ -47,8 +47,8 @@ extension FacebookOperationReauthentication {
 @MainActor
 class FacebookDeleteUserOperation: AuthenticatedOperation,
   @preconcurrency FacebookOperationReauthentication {
-  let facebookProvider: FacebookProviderAuthUI
-  init(facebookProvider: FacebookProviderAuthUI) {
+  let facebookProvider: FacebookProviderSwift
+  init(facebookProvider: FacebookProviderSwift) {
     self.facebookProvider = facebookProvider
   }
 

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AuthService+Facebook.swift

@@ -23,9 +23,9 @@ import FirebaseAuthSwiftUI
 
 public extension AuthService {
   @discardableResult
-  func withFacebookSignIn(scopes scopes: [String]? = nil) -> AuthService {
-    FacebookProviderAuthUI.configureProvider(scopes: scopes)
-    registerProvider(providerWithButton: FacebookProviderAuthUI.shared)
+  func withFacebookSignIn(_ provider: FacebookProviderSwift? = nil) -> AuthService {
+    registerProvider(providerWithButton: FacebookProviderAuthUI(provider: provider ??
+        FacebookProviderSwift()))
     return self
   }
 }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -19,10 +19,6 @@ import FirebaseAuth
 import FirebaseAuthSwiftUI
 import SwiftUI
 
-let kFacebookEmailScope = "email"
-let kFacebookProfileScope = "public_profile"
-let kDefaultFacebookScopes = [kFacebookEmailScope, kFacebookProfileScope]
-
 public enum FacebookProviderError: Error {
   case signInCancelled(String)
   case configurationInvalid(String)
@@ -31,44 +27,20 @@ public enum FacebookProviderError: Error {
   case authenticationToken(String)
 }
 
-public class FacebookProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUserSwift {
-  public let id: String = "facebook"
+public class FacebookProviderSwift: AuthProviderSwift, DeleteUserSwift {
   let scopes: [String]
-  let shortName = "Facebook"
   let providerId = "facebook.com"
   private let loginManager = LoginManager()
   private var rawNonce: String?
   private var shaNonce: String?
   // Needed for reauthentication
   var isLimitedLogin: Bool = true
-  
-  public var provider: AuthProviderSwift { self }
-
-  @MainActor private static var _shared: FacebookProviderAuthUI = FacebookProviderAuthUI(scopes: kDefaultFacebookScopes)
-
-  @MainActor public static var shared: FacebookProviderAuthUI {
-    return _shared
-  }
 
-  @MainActor public static func configureProvider(scopes: [String]? = nil, isLimitedLogin: Bool = true) {
-    _shared = FacebookProviderAuthUI(scopes: scopes, isLimitedLogin: isLimitedLogin)
-  }
-
-  public init(scopes: [String]? = nil, isLimitedLogin: Bool = true) {
-    self.scopes = scopes ?? kDefaultFacebookScopes
+  public init(scopes: [String] = ["email", "public_profile"], isLimitedLogin: Bool = true) {
+    self.scopes = scopes
     self.isLimitedLogin = isLimitedLogin
   }
 
-  @MainActor public func authButton() -> AnyView {
-    AnyView(SignInWithFacebookButton())
-  }
-
-  public func deleteUser(user: User) async throws {
-    let operation = FacebookDeleteUserOperation(facebookProvider: self)
-    try await operation(on: user)
-  }
-
-
   @MainActor public func createAuthCredential() async throws -> AuthCredential {
     let loginType: LoginTracking = isLimitedLogin ? .limited : .enabled
 
@@ -149,4 +121,22 @@ public class FacebookProviderAuthUI: AuthProviderSwift, AuthProviderUI, DeleteUs
         )
     }
   }
+
+  public func deleteUser(user: User) async throws {
+    let operation = FacebookDeleteUserOperation(facebookProvider: self)
+    try await operation(on: user)
+  }
+}
+
+public class FacebookProviderAuthUI: AuthProviderUI {
+  public var provider: AuthProviderSwift
+  public let id: String = "facebook.com"
+
+  public init(provider: AuthProviderSwift) {
+    self.provider = provider
+  }
+
+  @MainActor public func authButton() -> AnyView {
+    AnyView(SignInWithFacebookButton(facebookProvider: provider))
+  }
 }

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Views/SignInWithFacebookButton.swift

@@ -23,14 +23,16 @@ import SwiftUI
 @MainActor
 public struct SignInWithFacebookButton {
   @Environment(AuthService.self) private var authService
+  let facebookProvider: AuthProviderSwift
   @State private var errorMessage = ""
   @State private var showCanceledAlert = false
   @State private var limitedLogin = true
   @State private var showUserTrackingAlert = false
   @State private var trackingAuthorizationStatus: ATTrackingManager
     .AuthorizationStatus = .notDetermined
 
-  public init() {
+  public init(facebookProvider: AuthProviderSwift) {
+    self.facebookProvider = facebookProvider
     _trackingAuthorizationStatus = State(initialValue: ATTrackingManager
       .trackingAuthorizationStatus)
   }
@@ -65,7 +67,6 @@ extension SignInWithFacebookButton: View {
     Button(action: {
       Task {
         do {
-          let facebookProvider = FacebookProviderAuthUI(isLimitedLogin: limitedLogin)
           try await authService.signIn(facebookProvider)
         } catch {
           switch error {
@@ -128,6 +129,7 @@ extension SignInWithFacebookButton: View {
 
 #Preview {
   FirebaseOptions.dummyConfigurationForPreview()
-  return SignInWithFacebookButton()
+  let facebookProvider = FacebookProviderSwift()
+  return SignInWithFacebookButton(facebookProvider: facebookProvider)
     .environment(AuthService())
 }