🔀 :: (#122) Implementation of Logout

app/src/main/java/com/kdn/stack_knowledge/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.kdn.stack_knowledge
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
@@ -25,6 +26,7 @@ import com.stackknowledge.login.viewmodel.AuthViewModel
 import com.kdn.stack_knowledge.ui.StackKnowledgeApp
 import com.stackknowledge.user.R
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.runBlocking
 import remote.request.auth.LoginRequestModel
 import javax.inject.Inject
 import javax.inject.Named
@@ -72,7 +74,8 @@ class MainActivity : ComponentActivity() {
                         windowSizeClass = calculateWindowSizeClass(this@MainActivity),
                         onLoginButtonClick = {
                             googleSocialLogin()
-                        }
+                        },
+                        onLogout = { logout() }
                     )
                 }
             }
@@ -118,4 +121,14 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    private fun logout() {
+        runBlocking {
+            viewModel.deleteToken()
+        }
+        finish()
+
+        val intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
+    }
 }

app/src/main/java/com/kdn/stack_knowledge/navigation/StackKnowledgeNavHost.kt

@@ -24,6 +24,7 @@ import com.stackknowledge.shop.navigation.shopScreen
 import com.stackknowledge.shop.navigation.teacherShopRoute
 import com.stackknowledge.shop.navigation.teacherShopScreen
 import com.kdn.stack_knowledge.ui.StackKnowledgeAppState
+import com.stackknowledge.main.navigation.mainPageRoute
 import com.stackkowledge.mission.navigation.createMissionScreen
 import com.stackkowledge.mission.navigation.entireMissionScreen
 import com.stackkowledge.mission.navigation.navigateToEntireMission
@@ -37,6 +38,7 @@ fun StackKnowledgeNavHost(
     startDestination: String = roleCheckRoute,
     modifier: Modifier = Modifier,
     onLoginButtonClick: () -> Unit = {},
+    onLogout: () -> Unit,
 ) {
     val navController = appState.navController
 
@@ -46,8 +48,10 @@ fun StackKnowledgeNavHost(
         modifier = modifier
     ) {
         loginScreen(
-            onSuccess = navController::navigateToMain,
-            onLoginButtonClick = onLoginButtonClick
+            onSuccess = {
+                appState.navigateToTopLevelDestination(TopLevelDestination.MAIN)
+            },
+            onLoginButtonClick = onLoginButtonClick,
         )
         roleCheckScreen(
             onRoleButtonClick = navController::navigateToLogin
@@ -64,13 +68,29 @@ fun StackKnowledgeNavHost(
                     }
                 } else bottomNavigationNavigate(role, navController, navType)
             },
+            logoutSuccess = {
+                onLogout()
+                appState.navigateToTopLevelDestination(TopLevelDestination.ROLE_CHECK)
+            },
         )
         createMissionScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },
+            onNavigate = { role, navType ->
+                bottomNavigationNavigate(
+                    role,
+                    navController,
+                    navType
+                )
+            },
             createMissionSuccess = navController::navigateToMain
         )
         entireMissionScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },
+            onNavigate = { role, navType ->
+                bottomNavigationNavigate(
+                    role,
+                    navController,
+                    navType
+                )
+            },
             onItemClick = navController::navigateToResolveMission
         )
         rankingScreen(
@@ -80,16 +100,34 @@ fun StackKnowledgeNavHost(
             onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) }
         )
         resolveMissionScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },
+            onNavigate = { role, navType ->
+                bottomNavigationNavigate(
+                    role,
+                    navController,
+                    navType
+                )
+            },
             onBackClick = navController::popBackStack,
             solveMissionSuccess = navController::navigateToMain,
         )
         gradingAnswerScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },
+            onNavigate = { role, navType ->
+                bottomNavigationNavigate(
+                    role,
+                    navController,
+                    navType
+                )
+            },
             scoreMissionSuccess = navController::navigateToMain,
         )
         solvedMissionScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },
+            onNavigate = { role, navType ->
+                bottomNavigationNavigate(
+                    role,
+                    navController,
+                    navType
+                )
+            },
             onItemClick = navController::navigateToGradingAnswer
         )
         shopScreen(

app/src/main/java/com/kdn/stack_knowledge/navigation/TopLevelDestination.kt

@@ -2,4 +2,5 @@ package com.kdn.stack_knowledge.navigation
 
 enum class TopLevelDestination {
     ROLE_CHECK,
+    MAIN
 }

app/src/main/java/com/kdn/stack_knowledge/navigation/util/BottomNavigationNavigate.kt

@@ -4,6 +4,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.navOptions
 import com.minstone.ui.navigation.NavigateType
+import com.stackknowledge.main.navigation.mainPageRoute
 import com.stackknowledge.main.navigation.navigateToMain
 import com.stackknowledge.ranking.navigation.navigateToRanking
 import com.stackknowledge.ranking.navigation.navigateToTeacherRanking
@@ -20,7 +21,7 @@ fun bottomNavigationNavigate(
     navType: String
 ) {
     val topLevelNavOptions = navOptions {
-        popUpTo(navController.graph.findStartDestination().id) {
+        popUpTo(mainPageRoute) {
             inclusive = false
         }
         launchSingleTop = true

app/src/main/java/com/kdn/stack_knowledge/ui/StackKnowledgeApp.kt

@@ -12,11 +12,13 @@ fun StackKnowledgeApp(
         windowSizeClass = windowSizeClass
     ),
     onLoginButtonClick: () -> Unit = {},
+    onLogout: () -> Unit,
 ) {
     StackKnowledgeAndroidTheme { _, _ ->
         StackKnowledgeNavHost(
             appState = appState,
-            onLoginButtonClick = onLoginButtonClick
+            onLoginButtonClick = onLoginButtonClick,
+            onLogout = onLogout
         )
     }
 }

app/src/main/java/com/kdn/stack_knowledge/ui/StackKnowledgeAppState.kt

@@ -6,12 +6,18 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.util.trace
 import androidx.navigation.NavDestination
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navOptions
 import com.kdn.stack_knowledge.navigation.TopLevelDestination
+import com.stackknowledge.login.navigation.navigateToLogin
+import com.stackknowledge.login.navigation.navigateToRoleCheck
 import com.stackknowledge.login.navigation.roleCheckRoute
+import com.stackknowledge.main.navigation.navigateToMain
 import kotlinx.coroutines.CoroutineScope
 
 @Composable
@@ -53,4 +59,19 @@ class StackKnowledgeAppState(
         get() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact
 
     val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.values().asList()
+
+    fun navigateToTopLevelDestination(topLevelDestination: TopLevelDestination) {
+        trace("Navigation: ${topLevelDestination.name}") {
+            val topLevelNavOptions = navOptions {
+                popUpTo(navController.graph.findStartDestination().id) {
+                    inclusive = true
+                }
+            }
+
+            when (topLevelDestination) {
+                TopLevelDestination.ROLE_CHECK -> navController.navigateToRoleCheck(topLevelNavOptions)
+                TopLevelDestination.MAIN -> navController.navigateToMain(topLevelNavOptions)
+            }
+        }
+    }
 }

core/data/src/main/kotlin/com/stackknowledge/repository/auth/AuthRepository.kt

@@ -11,6 +11,8 @@ interface AuthRepository {
 
     suspend fun saveToken(token: LoginResponseModel)
 
+    suspend fun deleteToken()
+
     fun getRole(): Flow<String>
 
     fun logout(): Flow<Unit>

core/data/src/main/kotlin/com/stackknowledge/repository/auth/AuthRepositoryImpl.kt

@@ -24,11 +24,23 @@ class AuthRepositoryImpl @Inject constructor(
 
     override suspend fun saveToken(token: LoginResponseModel) {
         token.let {
-            localDataSource.setAccessToken(it.accessToken)
-            localDataSource.setAccessTime(it.expiredAt)
-            localDataSource.setRefreshToken(it.refreshToken)
-            localDataSource.setRefreshTime(it.expiredAt)
-            localDataSource.setAuthorityInfo(it.authority.toString())
+            with(localDataSource) {
+                setAccessToken(it.accessToken)
+                setAccessTime(it.expiredAt)
+                setRefreshToken(it.refreshToken)
+                setRefreshTime(it.expiredAt)
+                setAuthorityInfo(it.authority.toString())
+            }
+        }
+    }
+
+    override suspend fun deleteToken() {
+        with(localDataSource) {
+            removeAccessToken()
+            removeRefreshToken()
+            removeAccessTime()
+            removeRefreshTime()
+            removeAuthorityInfo()
         }
     }
 

core/datastore/src/main/java/com/stackknowledge/datastore/LocalAuthDataSource.kt

@@ -35,4 +35,6 @@ interface LocalAuthDataSource {
     suspend fun setAuthorityInfo(authority: String)
 
     fun getAuthorityInfo(): Flow<String>
+
+    suspend fun removeAuthorityInfo()
 }

core/datastore/src/main/java/com/stackknowledge/datastore/LocalAuthDataSourceImpl.kt

@@ -84,4 +84,10 @@ class LocalAuthDataSourceImpl @Inject constructor(
             it[AuthPreferenceKey.AUTHORITY] = authority
         }
     }
+
+    override suspend fun removeAuthorityInfo() {
+        dataStore.edit {
+            it.remove(AuthPreferenceKey.AUTHORITY)
+        }
+    }
 }

core/design-system/src/main/res/values/strings.xml

@@ -45,4 +45,6 @@
     <string name="finish_score_mission">문제 채점이 끝나셨습니까?</string>
     <string name="success_score_mission">문제 채점이 완료되었습니다!</string>
     <string name="discount_ordered_item">상품을 차감하시겠습니까?</string>
+    <string name="success_logout">로그아웃이 완료되었습니다.</string>
+    <string name="failure_logout">로그아웃이 실패했습니다.</string>
 </resources>

core/network/src/main/kotlin/com/stackknowledge/util/AuthInterceptor.kt

@@ -45,6 +45,8 @@ class AuthInterceptor @Inject constructor(
         runBlocking {
             val refreshTime = dataSource.getRefreshTime().first().replace("\"", "")
             val accessTime = dataSource.getAccessTime().first().replace("\"", "")
+            val refreshToken = dataSource.getRefreshToken().first().replace("\"", "")
+            val accessToken = dataSource.getAccessToken().first().replace("\"", "")
 
             if (refreshTime == "") {
                 return@runBlocking
@@ -82,9 +84,15 @@ class AuthInterceptor @Inject constructor(
                     } else throw NeedLoginException()
                 }
             }
-            val accessToken = dataSource.getAccessToken().first().replace("\"", "")
+            if (method == "DELETE") {
+                builder.addHeader("RefreshToken", refreshToken)
+            }
             builder.addHeader("Authorization", "Bearer $accessToken")
         }
-        return chain.proceed(builder.build())
+        val response = chain.proceed(builder.build())
+        return when (response.code) {
+            204 -> response.newBuilder().code(200).build()
+            else -> response
+        }
     }
 }

feature/login/src/main/java/com/stackknowledge/login/LoginScreen.kt

@@ -43,7 +43,7 @@ internal fun LoginRoute(
         onGoogleLoginButtonClicked = onGoogleLoginButtonClicked,
         loginUiState = loginUiState,
         viewModel = viewModel,
-        onLoginSuccess = onSuccess
+        onLoginSuccess = onSuccess,
     )
 }
 
@@ -129,6 +129,6 @@ private fun LoginScreen(
 fun LoginScreenPre() {
     LoginScreen(
         onGoogleLoginButtonClicked = {},
-        loginUiState = LoginUiState.Loading
+        loginUiState = LoginUiState.Loading,
     )
 }

feature/login/src/main/java/com/stackknowledge/login/navigation/LoginNavigation.kt

@@ -21,7 +21,7 @@ fun NavGraphBuilder.loginScreen(
     composable(route = loginRoute) {
         LoginRoute(
             onSuccess = onSuccess,
-            onGoogleLoginButtonClicked = onLoginButtonClick
+            onGoogleLoginButtonClicked = onLoginButtonClick,
         )
     }
 }

feature/login/src/main/java/com/stackknowledge/login/viewmodel/AuthViewModel.kt

@@ -8,6 +8,7 @@ import com.example.common.result.asResult
 import com.example.common.util.Event
 import com.example.common.util.errorHandling
 import com.stackknowledge.login.viewmodel.uistate.LoginUiState
+import com.stackknowledge.repository.auth.AuthRepository
 import com.stackknowledge.usecase.auth.SaveTokenUseCase
 import com.stackknowledge.usecase.auth.LoginStudentUseCase
 import com.stackknowledge.usecase.auth.LoginTeacherUseCase
@@ -25,6 +26,7 @@ class AuthViewModel @Inject constructor(
     private val loginStudentUseCase: LoginStudentUseCase,
     private val loginTeacherUseCase: LoginTeacherUseCase,
     private val saveTokenUseCase: SaveTokenUseCase,
+    private val authRepository: AuthRepository,
 ) : ViewModel() {
     private val _saveTokenRequest = MutableStateFlow<Event<Nothing>>(Event.Loading)
     internal val saveTokenRequest = _saveTokenRequest.asStateFlow()
@@ -72,4 +74,8 @@ class AuthViewModel @Inject constructor(
             _saveTokenRequest.value = it.errorHandling()
         }
     }
+
+    fun deleteToken() = viewModelScope.launch{
+        authRepository.deleteToken()
+    }
 }