hotfix: 토큰 401 에러 해결 (#563)

* hotfix: 뷰모델에 error 및 강제업데이트 프로퍼티 추가

* fix: 스플래시 내 로직 수정(자동 로그인, 강제업데이트, 401 에러)

* build: 1.0.9 버전 업데이트

* build: 버전코드 수정 ( 9 -> 10011 )

Author: m6z1

app/build.gradle.kts

@@ -18,13 +18,29 @@ android {
         applicationId = "com.into.websoso"
         minSdk = 30
         targetSdk = 34
-        versionCode = 10008
-        versionName = "1.0.8"
-
-        buildConfigField("String", "BASE_URL", gradleLocalProperties(rootDir).getProperty("base.url"))
-        buildConfigField("String", "S3_BASE_URL", gradleLocalProperties(rootDir).getProperty("s3.url"))
-        buildConfigField("String", "KAKAO_APP_KEY", gradleLocalProperties(rootDir).getProperty("kakao.app.key"))
-        buildConfigField("String", "AMPLITUDE_KEY", gradleLocalProperties(rootDir).getProperty("amplitude.key"))
+        versionCode = 10011
+        versionName = "1.0.9"
+
+        buildConfigField(
+            "String",
+            "BASE_URL",
+            gradleLocalProperties(rootDir).getProperty("base.url")
+        )
+        buildConfigField(
+            "String",
+            "S3_BASE_URL",
+            gradleLocalProperties(rootDir).getProperty("s3.url")
+        )
+        buildConfigField(
+            "String",
+            "KAKAO_APP_KEY",
+            gradleLocalProperties(rootDir).getProperty("kakao.app.key")
+        )
+        buildConfigField(
+            "String",
+            "AMPLITUDE_KEY",
+            gradleLocalProperties(rootDir).getProperty("amplitude.key")
+        )
 
         manifestPlaceholders["kakaoAppKey"] = gradleLocalProperties(rootDir)
             .getProperty("kakao.app.key").replace("\"", "")

app/src/main/java/com/into/websoso/ui/splash/SplashActivity.kt

@@ -9,6 +9,7 @@ import com.into.websoso.databinding.ActivityLoginBinding
 import com.into.websoso.ui.login.LoginActivity
 import com.into.websoso.ui.main.MainActivity
 import com.into.websoso.ui.splash.dialog.MinimumVersionDialogFragment
+import com.kakao.sdk.user.UserApiClient
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -21,27 +22,42 @@ class SplashActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_spla
         super.onCreate(savedInstanceState)
 
         setupObserver()
-        splashViewModel.autoLogin()
     }
 
     private fun setupObserver() {
+        splashViewModel.isUpdateRequired.observe(this) { isUpdateRequired ->
+            if (isUpdateRequired) {
+                showMinimumVersionDialog()
+                return@observe
+            }
+            splashViewModel.updateMyProfile()
+        }
+
+        splashViewModel.error.observe(this) { isError ->
+            if (isError) {
+                UserApiClient.instance.logout {
+                    startActivity(LoginActivity.getIntent(this))
+                }
+            }
+        }
+
         splashViewModel.isAutoLogin.observe(this) { isAutoLogin ->
             lifecycleScope.launch {
                 delay(1000L)
-                splashViewModel.updateMinimumVersion { isUpdateRequired ->
-                    if (isUpdateRequired) {
-                        showMinimumVersionDialog()
-                    } else {
-                        when (isAutoLogin) {
-                            true -> navigateToMainActivity()
-                            false -> navigateToLoginActivity()
-                        }
-                    }
+                when (isAutoLogin) {
+                    true -> navigateToMainActivity()
+                    false -> navigateToLoginActivity()
                 }
             }
         }
     }
 
+    private fun showMinimumVersionDialog() {
+        val dialog = MinimumVersionDialogFragment.newInstance()
+        dialog.isCancelable = false
+        dialog.show(supportFragmentManager, MINIMUM_VERSION_TAG)
+    }
+
     private fun navigateToMainActivity() {
         startActivity(MainActivity.getIntent(this, true))
         finish()
@@ -52,12 +68,6 @@ class SplashActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_spla
         finish()
     }
 
-    private fun showMinimumVersionDialog() {
-        val dialog = MinimumVersionDialogFragment.newInstance()
-        dialog.isCancelable = false
-        dialog.show(supportFragmentManager, MINIMUM_VERSION_TAG)
-    }
-
     companion object {
         private const val MINIMUM_VERSION_TAG = "MinimumVersionDialog"
     }

app/src/main/java/com/into/websoso/ui/splash/SplashViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.into.websoso.data.repository.AuthRepository
+import com.into.websoso.data.repository.UserRepository
 import com.into.websoso.data.repository.VersionRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -14,12 +15,46 @@ import javax.inject.Inject
 class SplashViewModel @Inject constructor(
     private val authRepository: AuthRepository,
     private val versionRepository: VersionRepository,
+    private val userRepository: UserRepository,
 ) : ViewModel() {
+    private val _isUpdateRequired: MutableLiveData<Boolean> = MutableLiveData()
+    val isUpdateRequired: LiveData<Boolean> get() = _isUpdateRequired
 
-    private var _isAutoLogin = MutableLiveData(false)
+    private var _isAutoLogin: MutableLiveData<Boolean> = MutableLiveData()
     val isAutoLogin: LiveData<Boolean> get() = _isAutoLogin
 
-    fun autoLogin() {
+    private var _error: MutableLiveData<Boolean> = MutableLiveData(false)
+    val error: LiveData<Boolean> get() = _error
+
+    init {
+        checkAndUpdateVersion()
+    }
+
+    private fun checkAndUpdateVersion() {
+        viewModelScope.launch {
+            runCatching {
+                versionRepository.isUpdateRequired()
+            }.onSuccess { isRequired ->
+                _isUpdateRequired.value = isRequired
+            }
+        }
+    }
+
+    // 토큰 만료 확인용 - 추후 로직 수정 필요
+    fun updateMyProfile() {
+        viewModelScope.launch {
+            runCatching {
+                userRepository.fetchMyProfile()
+            }.onSuccess {
+                autoLogin()
+            }.onFailure {
+                authRepository.clearTokens()
+                _error.value = true
+            }
+        }
+    }
+
+    private fun autoLogin() {
         viewModelScope.launch {
             if (authRepository.isAutoLogin) {
                 runCatching {
@@ -34,16 +69,4 @@ class SplashViewModel @Inject constructor(
             }
         }
     }
-
-    fun updateMinimumVersion(onUpdateRequired: (Boolean) -> Unit) {
-        viewModelScope.launch {
-            runCatching {
-                versionRepository.isUpdateRequired()
-            }.onSuccess { isUpdateRequired ->
-                onUpdateRequired(isUpdateRequired)
-            }.onFailure {
-                onUpdateRequired(false)
-            }
-        }
-    }
-}
+}