diff --git a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift index 1b88b113ff..6974a1d902 100644 --- a/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift +++ b/FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift @@ -14,7 +14,7 @@ protocol AppleOperationReauthentication { } extension AppleOperationReauthentication { - @MainActor func reauthenticate() async throws -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -22,8 +22,6 @@ extension AppleOperationReauthentication { do { let credential = try await appleProvider.createAuthCredential() try await user.reauthenticate(with: credential) - - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) } diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift index 78aee6b7d6..1e0db52283 100644 --- a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift +++ b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift @@ -21,7 +21,7 @@ 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 -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -35,8 +35,6 @@ extension EmailPasswordOperationReauthentication { let credential = EmailAuthProvider.credential(withEmail: email, password: password) try await Auth.auth().currentUser?.reauthenticate(with: credential) - - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) } diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift index 327b66c77a..8ad6cbe342 100644 --- a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift +++ b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift @@ -25,15 +25,10 @@ extension NSError { } } -public enum AuthenticationToken { - case apple(ASAuthorizationAppleIDCredential, String) - case firebase(String) -} - @MainActor public protocol AuthenticatedOperation { func callAsFunction(on user: User) async throws - func reauthenticate() async throws -> AuthenticationToken + func reauthenticate() async throws } public extension AuthenticatedOperation { diff --git a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift index 5fd744bee8..2100d08467 100644 --- a/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift +++ b/FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift @@ -28,7 +28,7 @@ protocol FacebookOperationReauthentication { } extension FacebookOperationReauthentication { - @MainActor func reauthenticate() async throws -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -36,8 +36,6 @@ extension FacebookOperationReauthentication { do { let credential = try await facebookProvider.createAuthCredential() try await user.reauthenticate(with: credential) - - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) } diff --git a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift index 758005163e..c651d66bab 100644 --- a/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift +++ b/FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift @@ -35,7 +35,7 @@ protocol GoogleOperationReauthentication { } extension GoogleOperationReauthentication { - @MainActor func reauthenticate() async throws -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -44,7 +44,6 @@ extension GoogleOperationReauthentication { let credential = try await googleProvider.createAuthCredential() try await user.reauthenticate(with: credential) - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) } diff --git a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift index 54215c913d..44b66b4403 100644 --- a/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift +++ b/FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift @@ -14,7 +14,7 @@ protocol OAuthOperationReauthentication { } extension OAuthOperationReauthentication { - @MainActor func reauthenticate() async throws -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -22,8 +22,6 @@ extension OAuthOperationReauthentication { do { let credential = try await oauthProvider.createAuthCredential() try await user.reauthenticate(with: credential) - - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) } diff --git a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift index 734ddfcba3..89b35fec96 100644 --- a/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift +++ b/FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift @@ -14,7 +14,7 @@ protocol TwitterOperationReauthentication { } extension TwitterOperationReauthentication { - @MainActor func reauthenticate() async throws -> AuthenticationToken { + @MainActor func reauthenticate() async throws { guard let user = Auth.auth().currentUser else { throw AuthServiceError.reauthenticationRequired("No user currently signed-in") } @@ -22,8 +22,6 @@ extension TwitterOperationReauthentication { do { let credential = try await twitterProvider.createAuthCredential() try await user.reauthenticate(with: credential) - - return .firebase("") } catch { throw AuthServiceError.signInFailed(underlying: error) }