Merge pull request #121 from Nexters/feature/clean-up

[FIX] 마이 페이지 화면 AccessToken 만료, 서버 에러 대응

Author: easyhooon

build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt

@@ -4,8 +4,8 @@ internal object ApplicationConfig {
     const val MinSdk = 26
     const val TargetSdk = 34
     const val CompileSdk = 34
-    const val VersionCode = 6
-    const val VersionName = "1.0.5"
+    const val VersionCode = 7
+    const val VersionName = "1.0.6"
     val JavaVersion = org.gradle.api.JavaVersion.VERSION_17
     const val JavaVersionAsInt = 17
 }

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/repository/TokenRepositoryImpl.kt

@@ -31,7 +31,7 @@ class TokenRepositoryImpl @Inject constructor(
         return dataSource.getUUID()
     }
 
-    override suspend fun clear() {
-        dataSource.clear()
+    override suspend fun clearAuthToken() {
+        dataSource.clearAuthToken()
     }
 }

core/datastore/src/main/kotlin/com/nexters/ilab/android/core/datastore/TokenDataSource.kt

@@ -7,5 +7,5 @@ interface TokenDataSource {
     suspend fun getAccessToken(): String
     suspend fun getRefreshToken(): String
     suspend fun getUUID(): Long
-    suspend fun clear()
+    suspend fun clearAuthToken()
 }

core/datastore/src/main/kotlin/com/nexters/ilab/android/core/datastore/TokenDataSourceImpl.kt

@@ -51,7 +51,7 @@ class TokenDataSourceImpl @Inject constructor(
             else throw exception
         }.first()[KEY_REFRESH_TOKEN] ?: ""
 
-    override suspend fun clear() {
+    override suspend fun clearAuthToken() {
         dataStore.edit { it.clear() }
     }
 }

core/designsystem/build.gradle.kts

@@ -12,7 +12,6 @@ android {
 dependencies {
     implementations(
         libs.androidx.core,
-        libs.androidx.splash,
         libs.coil.compose,
     )
 }

core/designsystem/src/main/res/values/strings.xml

@@ -24,6 +24,7 @@
     <string name="mypage_name_postfix">님</string>
     <string name="mypage_dropdown_delete">삭제하기</string>
     <string name="mypage_dropdown_share">공유하기</string>
+    <string name="mypage_logout">로그인 세션이 종료되어 다시 로그인이 필요합니다.</string>
 
     <!--    Setting -->
     <string name="setting_title">설정</string>

core/domain/src/main/kotlin/com/nexters/ilab/android/core/domain/repository/TokenRepository.kt

@@ -7,5 +7,5 @@ interface TokenRepository {
     suspend fun getAccessToken(): String
     suspend fun getRefreshToken(): String
     suspend fun getUUID(): Long
-    suspend fun clear()
+    suspend fun clearAuthToken()
 }

feature/intro/src/main/kotlin/com/nexters/ilab/android/feature/intro/IntroActivity.kt

@@ -3,13 +3,11 @@ package com.nexters.ilab.android.feature.intro
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.viewModels
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
-import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.nexters.ilab.android.core.designsystem.theme.ILabTheme
-import com.nexters.ilab.android.feature.intro.viewmodel.IntroViewModel
 import com.nexters.ilab.android.feature.navigator.LoginNavigator
 import com.nexters.ilab.android.feature.navigator.MainNavigator
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,8 +16,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class IntroActivity : ComponentActivity() {
-    private val viewModel: IntroViewModel by viewModels()
-
     @Inject
     lateinit var loginNavigator: LoginNavigator
 
@@ -58,7 +54,6 @@ class IntroActivity : ComponentActivity() {
                             withFinish = true,
                         )
                     },
-                    viewModel = viewModel,
                 )
             }
         }

feature/intro/src/main/kotlin/com/nexters/ilab/android/feature/intro/viewmodel/IntroViewModel.kt

@@ -39,7 +39,7 @@ class IntroViewModel @Inject constructor(
 
     fun autoLoginFail() = intent {
         viewModelScope.launch {
-            repository.clear()
+            repository.clearAuthToken()
             postSideEffect(IntroSideEffect.AutoLoginFail)
         }
     }

feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginActivity.kt

@@ -4,20 +4,16 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
 import com.nexters.ilab.android.core.designsystem.theme.ILabTheme
-import com.nexters.ilab.android.feature.login.viewmodel.LoginViewModel
 import com.nexters.ilab.android.feature.navigator.MainNavigator
 import dagger.hilt.android.AndroidEntryPoint
 import tech.thdev.compose.exteions.system.ui.controller.rememberExSystemUiController
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class LoginActivity : ComponentActivity() {
-    private val viewModel: LoginViewModel by viewModels()
-
     @Inject
     lateinit var mainNavigator: MainNavigator
 
@@ -46,7 +42,6 @@ class LoginActivity : ComponentActivity() {
                             withFinish = true,
                         )
                     },
-                    viewModel = viewModel,
                 )
             }
         }