refactor: use the same reauthenticate method for providers with same logic

Author: russellwheatley

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift

@@ -9,23 +9,12 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol AppleOperationReauthentication {
+protocol AppleOperationReauthentication: ProviderOperationReauthentication {
   var appleProvider: AppleProviderSwift { get }
 }
 
 extension AppleOperationReauthentication {
-  @MainActor func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    do {
-      let credential = try await appleProvider.createAuthCredential()
-      try await user.reauthenticate(with: credential)
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
+  var authProvider: AuthProviderSwift { appleProvider }
 }
 
 @MainActor

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

@@ -20,7 +20,6 @@ protocol EmailPasswordOperationReauthentication {
 }
 
 extension EmailPasswordOperationReauthentication {
-  // TODO: - @MainActor because User is non-sendable. Might change this once User is sendable in firebase-ios-sdk
   @MainActor func reauthenticate() async throws {
     guard let user = Auth.auth().currentUser else {
       throw AuthServiceError.reauthenticationRequired("No user currently signed-in")

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -45,3 +45,22 @@ public extension AuthenticatedOperation {
     }
   }
 }
+
+public protocol ProviderOperationReauthentication {
+  var authProvider: AuthProviderSwift { get }
+}
+
+public extension ProviderOperationReauthentication {
+  @MainActor func reauthenticate() async throws {
+    guard let user = Auth.auth().currentUser else {
+      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
+    }
+
+    do {
+      let credential = try await authProvider.createAuthCredential()
+      try await user.reauthenticate(with: credential)
+    } catch {
+      throw AuthServiceError.signInFailed(underlying: error)
+    }
+  }
+}

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

@@ -23,23 +23,12 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol FacebookOperationReauthentication {
+protocol FacebookOperationReauthentication: ProviderOperationReauthentication {
   var facebookProvider: FacebookProviderSwift { get }
 }
 
 extension FacebookOperationReauthentication {
-  @MainActor func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    do {
-      let credential = try await facebookProvider.createAuthCredential()
-      try await user.reauthenticate(with: credential)
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
+  var authProvider: AuthProviderSwift { facebookProvider }
 }
 
 @MainActor

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift

@@ -30,24 +30,12 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol GoogleOperationReauthentication {
+protocol GoogleOperationReauthentication: ProviderOperationReauthentication {
   var googleProvider: GoogleProviderSwift { get }
 }
 
 extension GoogleOperationReauthentication {
-  @MainActor func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    do {
-      let credential = try await googleProvider.createAuthCredential()
-      try await user.reauthenticate(with: credential)
-
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
+  var authProvider: AuthProviderSwift { googleProvider }
 }
 
 @MainActor

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift

@@ -9,23 +9,12 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol OAuthOperationReauthentication {
+protocol OAuthOperationReauthentication: ProviderOperationReauthentication {
   var oauthProvider: OAuthProviderSwift { get }
 }
 
 extension OAuthOperationReauthentication {
-  @MainActor func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    do {
-      let credential = try await oauthProvider.createAuthCredential()
-      try await user.reauthenticate(with: credential)
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
+  var authProvider: AuthProviderSwift { oauthProvider }
 }
 
 @MainActor

FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift

@@ -9,23 +9,12 @@
 import FirebaseAuthSwiftUI
 import Observation
 
-protocol TwitterOperationReauthentication {
+protocol TwitterOperationReauthentication: ProviderOperationReauthentication {
   var twitterProvider: TwitterProviderSwift { get }
 }
 
 extension TwitterOperationReauthentication {
-  @MainActor func reauthenticate() async throws {
-    guard let user = Auth.auth().currentUser else {
-      throw AuthServiceError.reauthenticationRequired("No user currently signed-in")
-    }
-
-    do {
-      let credential = try await twitterProvider.createAuthCredential()
-      try await user.reauthenticate(with: credential)
-    } catch {
-      throw AuthServiceError.signInFailed(underlying: error)
-    }
-  }
+  var authProvider: AuthProviderSwift { twitterProvider }
 }
 
 @MainActor