refactor: 세션 만료 및 로그아웃 처리를 AuthState 기반으로 재구현

app/build.gradle.kts

@@ -89,7 +89,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":domain"))
     implementation(project(":presentation"))
     implementation(project(":data"))
 

app/src/main/java/com/smtm/pickle/MainActivity.kt

@@ -5,18 +5,15 @@ import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.navigation.compose.rememberNavController
+import com.smtm.pickle.presentation.PickleApp
 import com.smtm.pickle.presentation.designsystem.theme.PickleTheme
-import com.smtm.pickle.presentation.navigation.GlobalNavEvent
-import com.smtm.pickle.presentation.navigation.PickleNavHost
-import com.smtm.pickle.presentation.navigation.route.LoginRoute
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -33,29 +30,7 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             PickleTheme {
-                val navController = rememberNavController()
-                val handleGlobalNavEvent: (GlobalNavEvent) -> Unit = remember(navController) {
-                    { event ->
-                        when (event) {
-                            is GlobalNavEvent.Logout -> {
-                                navController.navigate(LoginRoute) {
-                                    popUpTo(navController.graph.id) { inclusive = true }
-                                }
-                            }
-
-                            is GlobalNavEvent.SessionExpired -> {
-                                navController.navigate(LoginRoute) {
-                                    popUpTo(navController.graph.id) { inclusive = true }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                PickleNavHost(
-                    navController = navController,
-                    onGlobalNavEvent = handleGlobalNavEvent,
-                )
+                PickleApp()
             }
         }
     }

data/src/main/java/com/smtm/pickle/data/source/local/provider/TokenProviderImpl.kt

@@ -1,9 +1,12 @@
 package com.smtm.pickle.data.source.local.provider
 
 import com.smtm.pickle.data.source.local.datastore.TokenDataStore
+import com.smtm.pickle.domain.model.auth.AuthState
 import com.smtm.pickle.domain.model.auth.AuthToken
 import com.smtm.pickle.domain.provider.TokenProvider
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,6 +18,8 @@ class TokenProviderImpl @Inject constructor(
     @Volatile
     private var cachedToken: AuthToken? = null
 
+    private val _authState = MutableStateFlow<AuthState>(AuthState.Authenticated)
+
     override suspend fun init() {
         cachedToken = tokenDataStore.getToken()
     }
@@ -34,6 +39,13 @@ class TokenProviderImpl @Inject constructor(
     override suspend fun clearToken() {
         cachedToken = null
         tokenDataStore.clearToken()
+        _authState.value = AuthState.Unauthenticated
+    }
+
+    override suspend fun expireSession() {
+        cachedToken = null
+        tokenDataStore.clearToken()
+        _authState.value = AuthState.SessionExpired
     }
 
     override fun getCachedToken(): AuthToken? = cachedToken
@@ -44,4 +56,7 @@ class TokenProviderImpl @Inject constructor(
     override fun getAccessTokenFlow(): Flow<String?> =
         tokenDataStore.getAccessTokenFlow()
 
+    override fun getAuthStateFlow(): Flow<AuthState> =
+        _authState.asStateFlow()
+
 }

data/src/main/java/com/smtm/pickle/data/source/remote/auth/TokenRefresher.kt

@@ -44,7 +44,7 @@ class TokenRefresher @Inject constructor(
                 if (e is CancellationException) throw e
                 // 리프레시 토큰 만료 또는 무효일 때만 로그아웃 처리
                 if (e is HttpException && (e.code() == 401 || e.code() == 400)) {
-                    tokenProvider.clearToken()
+                    tokenProvider.expireSession()
                 }
                 return@withLock null
             }

domain/src/main/java/com/smtm/pickle/domain/model/auth/AuthState.kt

@@ -0,0 +1,7 @@
+package com.smtm.pickle.domain.model.auth
+
+sealed interface AuthState {
+    data object Authenticated : AuthState
+    data object Unauthenticated : AuthState
+    data object SessionExpired : AuthState
+}

domain/src/main/java/com/smtm/pickle/domain/provider/TokenProvider.kt

@@ -1,5 +1,6 @@
 package com.smtm.pickle.domain.provider
 
+import com.smtm.pickle.domain.model.auth.AuthState
 import com.smtm.pickle.domain.model.auth.AuthToken
 import kotlinx.coroutines.flow.Flow
 
@@ -19,9 +20,13 @@ interface TokenProvider {
 
     suspend fun clearToken()
 
+    suspend fun expireSession()
+
     fun getCachedToken(): AuthToken?
 
     fun getTokenFlow(): Flow<AuthToken?>
 
     fun getAccessTokenFlow(): Flow<String?>
+
+    fun getAuthStateFlow(): Flow<AuthState>
 }

presentation/src/main/java/com/smtm/pickle/presentation/AppViewModel.kt

@@ -0,0 +1,37 @@
+package com.smtm.pickle.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.smtm.pickle.domain.model.auth.AuthState
+import com.smtm.pickle.domain.provider.TokenProvider
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class AppViewModel @Inject constructor(
+    private val tokenProvider: TokenProvider,
+) : ViewModel() {
+
+    private val _authNavEvent = Channel<AuthNavEvent>(Channel.CONFLATED)
+    val authNavEvent = _authNavEvent.receiveAsFlow()
+
+    init {
+        viewModelScope.launch {
+            tokenProvider.getAuthStateFlow().collect { state ->
+                when (state) {
+                    AuthState.SessionExpired -> _authNavEvent.trySend(AuthNavEvent.ToLoginWithMessage)
+                    AuthState.Unauthenticated -> _authNavEvent.trySend(AuthNavEvent.ToLogin)
+                    else -> {}
+                }
+            }
+        }
+    }
+}
+
+sealed interface AuthNavEvent {
+    data object ToLogin : AuthNavEvent
+    data object ToLoginWithMessage : AuthNavEvent
+}

presentation/src/main/java/com/smtm/pickle/presentation/PickleApp.kt

@@ -0,0 +1,38 @@
+package com.smtm.pickle.presentation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.navigation.compose.rememberNavController
+import com.smtm.pickle.presentation.designsystem.components.snackbar.PickleSnackbar
+import com.smtm.pickle.presentation.designsystem.components.snackbar.SnackbarHost
+import com.smtm.pickle.presentation.designsystem.components.snackbar.model.SnackbarState
+import com.smtm.pickle.presentation.navigation.PickleNavHost
+import com.smtm.pickle.presentation.navigation.route.LoginRoute
+
+@Composable
+fun PickleApp(
+    appViewModel: AppViewModel = hiltViewModel(),
+) {
+    val navController = rememberNavController()
+    val snackbarState = remember { SnackbarState() }
+    val sessionExpiredMessage = stringResource(R.string.global_session_expired)
+
+    LaunchedEffect(Unit) {
+        appViewModel.authNavEvent.collect { event ->
+            navController.navigate(LoginRoute) {
+                popUpTo(navController.graph.id) { inclusive = true }
+            }
+            if (event is AuthNavEvent.ToLoginWithMessage) {
+                snackbarState.show(
+                    PickleSnackbar.snackbarShort(message = sessionExpiredMessage)
+                )
+            }
+        }
+    }
+
+    PickleNavHost(navController = navController)
+    SnackbarHost(snackbarState)
+}

presentation/src/main/java/com/smtm/pickle/presentation/main/MainScreen.kt

@@ -29,7 +29,6 @@ import com.smtm.pickle.presentation.home.HomeScreen
 import com.smtm.pickle.presentation.main.component.DimOverlay
 import com.smtm.pickle.presentation.main.component.HomeExpandableFab
 import com.smtm.pickle.presentation.mypage.MyPageScreen
-import com.smtm.pickle.presentation.navigation.GlobalNavEvent
 import com.smtm.pickle.presentation.navigation.PickleBottomNavigationBar
 import com.smtm.pickle.presentation.navigation.route.AlarmSettingRoute
 import com.smtm.pickle.presentation.navigation.route.HomeTabRoute
@@ -51,7 +50,6 @@ import java.time.LocalDate
 @Composable
 fun MainScreen(
     rootNavController: NavHostController,
-    onGlobalNavEvent: (GlobalNavEvent) -> Unit,
 ) {
     val tabNavController = rememberNavController()
     val navBackStackEntry by tabNavController.currentBackStackEntryAsState()

presentation/src/main/java/com/smtm/pickle/presentation/mypage/navigation/MyPageNavigation.kt

@@ -12,7 +12,6 @@ import com.smtm.pickle.presentation.mypage.profile.nicknamesetting.NicknameSetti
 import com.smtm.pickle.presentation.navigation.route.AlarmSettingRoute
 import com.smtm.pickle.presentation.navigation.route.LedgerCreateRoute
 import com.smtm.pickle.presentation.navigation.route.LedgerDetailRoute
-import com.smtm.pickle.presentation.navigation.route.LoginRoute
 import com.smtm.pickle.presentation.navigation.route.MyLedgerRoute
 import com.smtm.pickle.presentation.navigation.route.MyProfileRoute
 import com.smtm.pickle.presentation.navigation.route.NicknameSettingRoute
@@ -45,14 +44,6 @@ fun NavGraphBuilder.myPageDestinations(navController: NavController) {
                     context.startActivity(intent)
                 }
             },
-            onNavigateToLogin = {
-                navController.navigate(LoginRoute) {
-                    popUpTo(navController.graph.id) {
-                        inclusive = true
-                    }
-                    launchSingleTop = true
-                }
-            },
             onNavigateBack = {
                 navController.popBackStack()
             },

presentation/src/main/java/com/smtm/pickle/presentation/navigation/PickleNavHost.kt

@@ -16,7 +16,6 @@ import com.smtm.pickle.presentation.verdict.navigation.verdictDestinations
 @Composable
 fun PickleNavHost(
     navController: NavHostController = rememberNavController(),
-    onGlobalNavEvent: (GlobalNavEvent) -> Unit,
 ) {
     NavHost(
         navController = navController,
@@ -36,7 +35,6 @@ fun PickleNavHost(
             composable<MainRoute> {
                 MainScreen(
                     rootNavController = navController,
-                    onGlobalNavEvent = onGlobalNavEvent
                 )
             }
 
@@ -48,4 +46,4 @@ fun PickleNavHost(
             myPageDestinations(navController)
         }
     )
-}
+}

presentation/src/main/java/com/smtm/pickle/presentation/setting/SettingScreen.kt

@@ -40,7 +40,6 @@ import com.smtm.pickle.presentation.setting.model.SettingTrailingType
 fun SettingScreen(
     viewModel: SettingViewModel = hiltViewModel(),
     onNavigateToPrivacyPolicy: () -> Unit,
-    onNavigateToLogin: () -> Unit,
     onNavigateBack: () -> Unit,
 ) {
     val context = LocalContext.current
@@ -56,10 +55,6 @@ fun SettingScreen(
                         onNavigateToPrivacyPolicy()
                     }
 
-                    SettingEffect.NavigateToLogin -> {
-                        onNavigateToLogin()
-                    }
-
                     SettingEffect.NavigateBack -> {
                         onNavigateBack()
                     }

presentation/src/main/java/com/smtm/pickle/presentation/setting/SettingViewModel.kt

@@ -61,7 +61,6 @@ class SettingViewModel @Inject constructor(
             logoutUseCase()
                 .onSuccess {
                     _uiState.update { it.copy(isLoading = false) }
-                    _effect.emit(SettingEffect.NavigateToLogin)
                 }
                 .onFailure {
                     _uiState.update { it.copy(isLoading = false) }
@@ -79,7 +78,6 @@ class SettingViewModel @Inject constructor(
             withdrawAccountUseCase()
                 .onSuccess {
                     _uiState.update { it.copy(isLoading = false) }
-                    _effect.emit(SettingEffect.NavigateToLogin)
                 }
                 .onFailure {
                     _uiState.update { it.copy(isLoading = false) }
@@ -115,7 +113,6 @@ data class SettingUiState(
 
 sealed interface SettingEffect {
     data object NavigateToPrivacyPolicy : SettingEffect
-    data object NavigateToLogin : SettingEffect
     data object NavigateBack : SettingEffect
     data object OpenGooglePlay : SettingEffect
     data class ShowSnackBar(val msg: String) : SettingEffect

presentation/src/main/res/values/strings.xml

@@ -142,4 +142,7 @@
     <string name="setting_dialog_withdraw_description">탈퇴하면 이전 기록이 모두 삭제돼요.\n그래도 괜찮으신가요?</string>
     <string name="setting_dialog_withdraw_confirm">탈퇴하기</string>
 
+    <!-- Global -->
+    <string name="global_session_expired">세션이 만료되었습니다. 다시 로그인해주세요.</string>
+
 </resources>