feat: delete user for facebook

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift

@@ -6,7 +6,7 @@ protocol EmailPasswordOperationReauthentication {
 }
 
 extension EmailPasswordOperationReauthentication {
-  func reauthenticate() async throws -> AuthenticationToken {
+  @MainActor func reauthenticate() async throws -> AuthenticationToken {
     guard let user = Auth.auth().currentUser else {
       throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
     }
@@ -28,6 +28,7 @@ extension EmailPasswordOperationReauthentication {
   }
 }
 
+@MainActor
 class EmailPasswordDeleteUserOperation: AuthenticatedOperation,
   EmailPasswordOperationReauthentication {
   let passwordPrompt: PasswordPromptCoordinator

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -16,6 +16,7 @@ public enum AuthenticationToken {
   case firebase(String)
 }
 
+@MainActor
 public protocol AuthenticatedOperation {
   func callAsFunction(on user: User) async throws
   func reauthenticate() async throws -> AuthenticationToken

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -12,6 +12,7 @@ public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
 
 public protocol FacebookProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential
+  @MainActor func deleteUser(user: User) async throws
 }
 
 public protocol PhoneAuthProviderAuthUIProtocol: ExternalAuthProvider {
@@ -200,7 +201,8 @@ public final class AuthService {
       try await linkAccounts(credentials: credentials)
     } else {
       do {
-        try await auth.signIn(with: credentials)
+        let result = try await auth.signIn(with: credentials)
+        signedInCredential = result.credential
         updateAuthenticationState()
       } catch {
         authenticationState = .unauthenticated
@@ -232,9 +234,13 @@ public final class AuthService {
 public extension AuthService {
   func deleteUser() async throws {
     do {
-      if let user = auth.currentUser {
-        let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
-        try await operation(on: user)
+      if let user = auth.currentUser, let providerId = signedInCredential?.provider {
+        if providerId == "password" {
+          let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
+          try await operation(on: user)
+        } else if providerId == "facebook.com" {
+          try await safeFacebookProvider.deleteUser(user: user)
+        }
       }
 
     } catch {
@@ -276,7 +282,8 @@ public extension AuthService {
     authenticationState = .authenticating
 
     do {
-      try await auth.createUser(withEmail: email, password: password)
+      let result = try await auth.createUser(withEmail: email, password: password)
+      signedInCredential = result.credential
       updateAuthenticationState()
     } catch {
       authenticationState = .unauthenticated

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

@@ -9,17 +9,19 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol FacebookOperationReauthentication {}
+protocol FacebookOperationReauthentication {
+  var facebookProvider: FacebookProviderAuthUI { get }
+}
 
 extension FacebookOperationReauthentication {
-  func reauthenticate() async throws -> AuthenticationToken {
+  @MainActor func reauthenticate() async throws -> AuthenticationToken {
     guard let user = Auth.auth().currentUser else {
       throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
     }
 
     do {
-      let credential = try await FacebookProviderAuthUI.shared
-        .signInWithFacebook(isLimitedLogin: FacebookProviderAuthUI.shared.isLimitedLogin)
+      let credential = try await facebookProvider
+        .signInWithFacebook(isLimitedLogin: facebookProvider.isLimitedLogin)
       try await user.reauthenticate(with: credential)
 
       return .firebase("")
@@ -29,8 +31,13 @@ extension FacebookOperationReauthentication {
   }
 }
 
-class FacebookDeleteUserOperation: AuthenticatedOperation, FacebookOperationReauthentication {
-  init() {}
+@MainActor
+class FacebookDeleteUserOperation: AuthenticatedOperation,
+  @preconcurrency FacebookOperationReauthentication {
+  let facebookProvider: FacebookProviderAuthUI
+  init(facebookProvider: FacebookProviderAuthUI) {
+    self.facebookProvider = facebookProvider
+  }
 
   func callAsFunction(on user: User) async throws {
     try await callAsFunction(on: user) {

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -16,16 +16,16 @@ public enum FacebookProviderError: Error {
   case authenticationToken(String)
 }
 
-public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol, @unchecked Sendable {
+public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol {
   public let id: String = "facebook"
   let scopes: [String]
   let shortName = "Facebook"
   let providerId = "facebook.com"
   private let loginManager = LoginManager()
-  private var rawNonce: String
-  private var shaNonce: String
+  private var rawNonce: String?
+  private var shaNonce: String?
   // Needed for reauthentication
-  @MainActor public var isLimitedLogin: Bool = true
+  var isLimitedLogin: Bool = true
 
   @MainActor private static var _shared: FacebookProviderAuthUI?
 
@@ -42,24 +42,29 @@ public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol, @unchecked
 
   private init(scopes: [String]? = nil) {
     self.scopes = scopes ?? kDefaultFacebookScopes
-    rawNonce = CommonUtils.randomNonce()
-    shaNonce = CommonUtils.sha256Hash(of: rawNonce)
   }
 
   @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 signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential {
     let loginType: LoginTracking = isLimitedLogin ? .limited : .enabled
     self.isLimitedLogin = isLimitedLogin
 
     guard let configuration: LoginConfiguration = {
       if loginType == .limited {
+        rawNonce = CommonUtils.randomNonce()
+        shaNonce = CommonUtils.sha256Hash(of: rawNonce!)
         return LoginConfiguration(
           permissions: scopes,
           tracking: loginType,
-          nonce: shaNonce
+          nonce: shaNonce!
         )
       } else {
         return LoginConfiguration(
@@ -116,7 +121,7 @@ public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol, @unchecked
     if let idToken = AuthenticationToken.current {
       let credential = OAuthProvider.credential(withProviderID: providerId,
                                                 idToken: idToken.tokenString,
-                                                rawNonce: rawNonce)
+                                                rawNonce: rawNonce!)
       return credential
     } else {
       throw FacebookProviderError