Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions DevLog/Data/Repository/AuthenticationRepositoryImpl.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,29 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
}

func signIn(_ provider: AuthProvider) async throws {
let response: AuthDataResponse
switch provider {
case .apple:
response = try await appleAuthService.signIn()
case .github:
response = try await githubAuthService.signIn()
case .google:
response = try await googleAuthService.signIn()
authService.beginSignIn()

do {
let response: AuthDataResponse
switch provider {
case .apple:
response = try await appleAuthService.signIn()
case .github:
response = try await githubAuthService.signIn()
case .google:
response = try await googleAuthService.signIn()
}

try await userService.upsertUser(response)
authService.completeSignIn()
} catch {
if authService.uid != nil {
try? await authService.clearCurrentSession()
}

authService.cancelSignIn()
throw error
}
try await userService.upsertUser(response)
}

func signOut() async throws {
Expand Down
30 changes: 28 additions & 2 deletions DevLog/Infra/Service/AuthService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ final class AuthService {
private let logger = Logger(category: "AuthService")
private let subject = CurrentValueSubject<Bool, Never>(Auth.auth().currentUser != nil)
private var handler: AuthStateDidChangeListenerHandle?
private var isCompletingSignIn = false

var uid: String? {
Auth.auth().currentUser?.uid
Expand All @@ -27,9 +28,16 @@ final class AuthService {

init() {
handler = Auth.auth().addStateDidChangeListener { [weak self] _, user in
guard let self else { return }
let signedIn = user != nil
self?.logger.info("Firebase auth state changed. signedIn: \(signedIn)")
self?.subject.send(signedIn)
self.logger.info("Firebase auth state changed. signedIn: \(signedIn)")

if signedIn && self.isCompletingSignIn {
self.logger.info("Delaying signed-in publication until user bootstrap finishes")
return
}

self.subject.send(signedIn)
}
}

Expand All @@ -42,6 +50,24 @@ final class AuthService {
subject.eraseToAnyPublisher()
}

func beginSignIn() {
logger.info("Beginning sign-in bootstrap")
isCompletingSignIn = true
subject.send(false)
}

func completeSignIn() {
logger.info("Completing sign-in bootstrap")
isCompletingSignIn = false
subject.send(Auth.auth().currentUser != nil)
}

func cancelSignIn() {
logger.info("Cancelling sign-in bootstrap")
isCompletingSignIn = false
subject.send(Auth.auth().currentUser != nil)
}

func getProviderID() async throws -> String? {
logger.info("Fetching current provider ID")

Expand Down