[#302] FCM토큰이 유효하지 않을 때, 에러가 뜨고 로컬 세션이 유지되는 이슈를 해결한다 (#303)

* feat: CurrentValueSubject를 통해 FirebaseAuth의 세션이 상시 반영되도록 추가

* refactor: 기존 수동으로 세션 처리하는 로직 제거

* feat: 로그인 세션을 FirebaseAuth 기준으로 일원화

Author: opficdev

DevLog/App/Assembler/DataAssembler.swift

@@ -34,8 +34,7 @@ final class DataAssembler: Assembler {
 
         container.register(AuthSessionRepository.self) {
             AuthSessionRepositoryImpl(
-                authService: container.resolve(AuthService.self),
-                userDefaultsStore: container.resolve(UserDefaultsStore.self)
+                authService: container.resolve(AuthService.self)
             )
         }
 

DevLog/App/Assembler/DomainAssembler.swift

@@ -139,14 +139,6 @@ private extension DomainAssembler {
             UpdateSystemThemeUseCaseImpl(container.resolve(UserPreferencesRepository.self))
         }
 
-        container.register(FetchFirstLaunchUseCase.self) {
-            FetchFirstLaunchUseCaseImpl(container.resolve(UserPreferencesRepository.self))
-        }
-
-        container.register(UpdateFirstLaunchUseCase.self) {
-            UpdateFirstLaunchUseCaseImpl(container.resolve(UserPreferencesRepository.self))
-        }
-
         container.register(FetchRecentSearchQueriesUseCase.self) {
             FetchRecentSearchQueriesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
         }

DevLog/App/DevLogApp.swift

@@ -20,11 +20,7 @@ struct DevLogApp: App {
         WindowGroup {
             RootView(viewModel: RootViewModel(
                 sessionUseCase: container.resolve(AuthSessionUseCase.self),
-                signOutUseCase: container.resolve(SignOutUseCase.self),
-                fetchFirstLaunchUseCase: container.resolve(FetchFirstLaunchUseCase.self),
-                updateFirstLaunchUseCase: container.resolve(UpdateFirstLaunchUseCase.self),
-                observeSystemThemeUseCase: container.resolve(ObserveSystemThemeUseCase.self),
-                updateSystemThemeUseCase: container.resolve(UpdateSystemThemeUseCase.self)
+                observeSystemThemeUseCase: container.resolve(ObserveSystemThemeUseCase.self)
             ))
             .autocorrectionDisabled()
         }

DevLog/App/RootView.swift

@@ -16,32 +16,19 @@ struct RootView: View {
         ZStack {
             Color(UIColor.systemGroupedBackground).ignoresSafeArea()
             if let signIn = viewModel.state.signIn {
-                if signIn && !viewModel.state.isFirstLaunch {
+                if signIn {
                     MainView(viewModel: MainViewModel(
                         observeUnreadPushCountUseCase: container.resolve(ObserveUnreadPushCountUseCase.self)
                     ))
                 } else {
                     LoginView(viewModel: LoginViewModel(
-                        signInUseCase: container.resolve(SignInUseCase.self),
-                        signOutUseCase: container.resolve(SignOutUseCase.self),
-                        sessionUseCase: container.resolve(AuthSessionUseCase.self))
+                        signInUseCase: container.resolve(SignInUseCase.self))
                     )
-                    .onAppear {
-                        viewModel.send(.onAppear)
-                    }
-                }
-            } else {
-                Color.clear.onAppear {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
-                        if viewModel.state.signIn == nil {
-                            viewModel.send(.setFirstLaunch(true))
-                            viewModel.send(.signOutAuto)
-                        }
-                    }
                 }
             }
         }
         .preferredColorScheme(viewModel.state.theme.colorScheme)
+        .onAppear { viewModel.send(.onAppear) }
         .alert(viewModel.state.alertTitle, isPresented: Binding(
             get: { viewModel.state.showAlert },
             set: { viewModel.send(.setAlert($0)) }
@@ -50,12 +37,6 @@ struct RootView: View {
         } message: {
             Text(viewModel.state.alertMessage)
         }
-        .onChange(of: viewModel.state.isFirstLaunch) { _, newValue in
-            if newValue {
-                viewModel.send(.setFirstLaunch(false))
-                viewModel.send(.signOutAuto)
-            }
-        }
         .sheet(item: $selectedRoute) { route in
             switch route {
             case .todoDetail(let todoId):

DevLog/Data/Repository/AuthSessionRepositoryImpl.swift

@@ -9,24 +9,12 @@ import Combine
 
 final class AuthSessionRepositoryImpl: AuthSessionRepository {
     private let authService: AuthService
-    private let userDefaultsStore: UserDefaultsStore
 
-    init(authService: AuthService, userDefaultsStore: UserDefaultsStore) {
+    init(authService: AuthService) {
         self.authService = authService
-        self.userDefaultsStore = userDefaultsStore
-        self.signIn = authService.uid != nil
     }
 
-    @Published private var signIn: Bool = false
-
     var signedInPublisher: AnyPublisher<Bool, Never> {
-        $signIn.eraseToAnyPublisher()
-    }
-
-    func setSession(_ signedIn: Bool) {
-        if !signedIn {
-            userDefaultsStore.removeAll()
-        }
-        self.signIn = signedIn
+        authService.signedInPublisher
     }
 }

DevLog/Data/Repository/AuthenticationRepositoryImpl.swift

@@ -44,16 +44,21 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
               let providerID = try await authService.getProviderID(),
               let provider = AuthProvider(rawValue: providerID)
         else {
-            throw AuthError.notAuthenticated
+            try await authService.clearCurrentSession()
+            return
         }
 
-        switch provider {
-        case .apple:
-            try await appleAuthService.signOut(uid)
-        case .github:
-            try await githubAuthService.signOut(uid)
-        case .google:
-            try await googleAuthService.signOut(uid)
+        do {
+            switch provider {
+            case .apple:
+                try await appleAuthService.signOut(uid)
+            case .github:
+                try await githubAuthService.signOut(uid)
+            case .google:
+                try await googleAuthService.signOut(uid)
+            }
+        } catch AuthError.notAuthenticated {
+            try await authService.clearCurrentSession()
         }
     }
 

DevLog/Data/Repository/UserPreferencesRepositoryImpl.swift

@@ -11,7 +11,6 @@ import Combine
 final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
     private enum Key {
         static let theme = "theme"
-        static let firstLaunch = "isFirstLaunch"
         static let recentQueries = "Search.recentQueries"
         static let pushSortOrder = "PushNotification.sortOption"
         static let pushTimeFilter = "PushNotification.timeFilter"
@@ -50,17 +49,6 @@ final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
         themeStore.send(theme)
     }
 
-    func isFirstLaunch() -> Bool {
-        if store.string(forKey: Key.firstLaunch) == nil {
-            return true
-        }
-        return store.bool(forKey: Key.firstLaunch)
-    }
-
-    func setFirstLaunch(_ value: Bool) {
-        store.setBool(value, forKey: Key.firstLaunch)
-    }
-
     func recentSearchQueries() -> [String] {
         store.stringArray(forKey: Key.recentQueries)
     }

DevLog/Domain/Protocol/AuthSessionRepository.swift

@@ -9,5 +9,4 @@ import Combine
 
 protocol AuthSessionRepository {
     var signedInPublisher: AnyPublisher<Bool, Never> { get }
-    func setSession(_ signedIn: Bool)
 }

DevLog/Domain/Protocol/UserPreferencesRepository.swift

@@ -13,9 +13,6 @@ protocol UserPreferencesRepository {
     func systemTheme() -> SystemTheme
     func setSystemTheme(_ theme: SystemTheme)
 
-    func isFirstLaunch() -> Bool
-    func setFirstLaunch(_ value: Bool)
-
     func recentSearchQueries() -> [String]
     func setRecentSearchQueries(_ queries: [String])
 

DevLog/Domain/UseCase/Auth/Session/AuthSessionUseCase.swift

@@ -9,5 +9,4 @@ import Combine
 
 protocol AuthSessionUseCase {
     var signedInPublisher: AnyPublisher<Bool, Never> { get }
-    func execute(_ signIn: Bool)
 }