[mod] 자동 로그인, 로그인 로직 수정

app/src/main/java/com/sopt/geonppang/presentation/SplashActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import com.sopt.geonppang.R
+import com.sopt.geonppang.data.datasource.local.GPDataSource
 import com.sopt.geonppang.databinding.ActivitySplashBinding
 import com.sopt.geonppang.presentation.auth.SignActivity
 import com.sopt.geonppang.util.binding.BindingActivity
@@ -23,13 +24,22 @@ class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_
     private fun loadSplashScreen() {
         lifecycleScope.launch {
             delay(1500L)
-            moveToSign()
+            setAutoLogin()
             finish()
         }
     }
 
+    private fun setAutoLogin() {
+        val gpDataSource = GPDataSource(this)
+        if (gpDataSource.isLogin) moveToHome()
+        else moveToSign()
+    }
+
+    private fun moveToHome() {
+        startActivity(Intent(this, MainActivity::class.java))
+    }
+
     private fun moveToSign() {
         startActivity(Intent(this, SignActivity::class.java))
-        finish()
     }
 }

app/src/main/java/com/sopt/geonppang/presentation/auth/AuthViewModel.kt

@@ -86,6 +86,10 @@ class AuthViewModel @Inject constructor(
         return isValidNickname.value == true
     }
 
+    fun setAutoLogin() {
+        gpDataSource.isLogin = true
+    }
+
     fun signUp(
         platformType: PlatformType,
         platformToken: String,
@@ -116,8 +120,6 @@ class AuthViewModel @Inject constructor(
                         gpDataSource.refreshToken = BEARER_PREFIX + refreshToken
                     }
                     _signUpState.value = UiState.Success(true)
-                    Timber.tag("access token").d(gpDataSource.accessToken)
-                    Timber.tag("refresh token").d(gpDataSource.refreshToken)
                 }
                 .onFailure { throwable ->
                     Timber.e(throwable.message)
@@ -131,6 +133,8 @@ class AuthViewModel @Inject constructor(
                 authRepository.settingNickname(RequestNicknameSetting(nickname))
                     .onSuccess {
                         _signUpState.value = UiState.Success(true)
+                        // 소셜 회원가입 시 자동 로그인 설정
+                        setAutoLogin()
                     }
                     .onFailure { throwable ->
                         Timber.e(throwable.message)

app/src/main/java/com/sopt/geonppang/presentation/auth/SignActivity.kt

@@ -51,6 +51,7 @@ class SignActivity :
                 }
 
                 AuthRoleType.USER -> {
+                    authViewModel.setAutoLogin()
                     moveToMain()
                 }
 

app/src/main/java/com/sopt/geonppang/presentation/login/LogInViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.sopt.geonppang.data.datasource.local.GPDataSource
 import com.sopt.geonppang.data.model.request.RequestLogin
 import com.sopt.geonppang.domain.repository.AuthRepository
+import com.sopt.geonppang.util.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -19,26 +20,33 @@ class LogInViewModel @Inject constructor(
 ) : ViewModel() {
     val loginEmail = MutableStateFlow("")
     val loginPassword = MutableStateFlow("")
-    private val _loginState = MutableStateFlow<Boolean?>(null)
+    private val _loginState = MutableStateFlow<UiState<Boolean>>(UiState.Loading)
     val loginState get() = _loginState.asStateFlow()
 
     fun initLogin() {
-        _loginState.value = null
+        _loginState.value = UiState.Loading
+    }
+
+    fun setAutoLogin() {
+        gpDataSource.isLogin = true
     }
 
     fun login() {
         viewModelScope.launch {
             authRepository.login(RequestLogin(loginEmail.value, loginPassword.value))
                 .onSuccess { loginResponse ->
                     val responseHeader = loginResponse.headers()
-                    val accessToken = responseHeader[AUTHORIZATION].toString()
+                    val accessToken = responseHeader[AUTHORIZATION]
+                    val refreshToken = responseHeader[AUTHORIZATION_REFRESH]
                     if (loginResponse.code() == 200) {
                         gpDataSource.accessToken = BEARER_PREFIX + accessToken
+                        gpDataSource.refreshToken = BEARER_PREFIX + refreshToken
                         gpDataSource.isLogin = true
-                        _loginState.value = true
+                        _loginState.value = UiState.Success(true)
+                        setAutoLogin()
                     }
                     if (loginResponse.code() == 400) {
-                        _loginState.value = false
+                        _loginState.value = UiState.Error(loginResponse.message())
                     }
                     if (loginResponse.code() == 500) {
                         Timber.tag("서버 오류")
@@ -51,6 +59,7 @@ class LogInViewModel @Inject constructor(
 
     companion object {
         const val AUTHORIZATION = "Authorization"
+        const val AUTHORIZATION_REFRESH = "Authorization-refresh"
         const val BEARER_PREFIX = "Bearer "
     }
 }

app/src/main/java/com/sopt/geonppang/presentation/login/LoginActivity.kt

@@ -6,10 +6,10 @@ import androidx.activity.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.sopt.geonppang.R
-import com.sopt.geonppang.data.datasource.local.GPDataSource
 import com.sopt.geonppang.databinding.ActivityLoginBinding
+import com.sopt.geonppang.presentation.MainActivity
 import com.sopt.geonppang.presentation.auth.SignUpActivity
-import com.sopt.geonppang.presentation.home.HomeFragment
+import com.sopt.geonppang.util.UiState
 import com.sopt.geonppang.util.binding.BindingActivity
 import com.sopt.geonppang.util.extension.hideKeyboard
 import dagger.hilt.android.AndroidEntryPoint
@@ -25,7 +25,6 @@ class LoginActivity :
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
 
-        autoLogin()
         addListener()
         collectData()
     }
@@ -45,11 +44,12 @@ class LoginActivity :
     private fun collectData() {
         viewModel.loginState.flowWithLifecycle(lifecycle).onEach { loginState ->
             when (loginState) {
-                true -> {
+                is UiState.Success -> {
                     moveToHome()
+                    viewModel.setAutoLogin()
                 }
 
-                false -> {
+                is UiState.Error -> {
                     showLoginFailDialog()
                     viewModel.initLogin()
                 }
@@ -64,20 +64,16 @@ class LoginActivity :
     }
 
     private fun moveToHome() {
-        startActivity(Intent(this, HomeFragment::class.java))
+        val intent = Intent(this, MainActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(intent)
         finish()
     }
 
     private fun moveToSignup() {
         startActivity(Intent(this, SignUpActivity::class.java))
     }
 
-    private fun autoLogin() {
-        val gpDataSource = GPDataSource(this)
-        if (gpDataSource.isLogin)
-            moveToHome()
-    }
-
     companion object {
         const val LOGIN_FAIL = "loginFail"
     }