[feat] 온보딩 / 로그아웃 서버통신 구현

app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt

@@ -23,6 +23,7 @@ class AuthInterceptor @Inject constructor(
     private val dataStoreRepository: DataStoreRepository
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
+        runBlocking { Timber.e("액세스토큰 : ${getAccessToken()}, 리프레시토큰 : ${getRefreshToken()}") }
         val originalRequest = chain.request()
 
         val headerRequest = originalRequest.newAuthBuilder()
@@ -33,31 +34,11 @@ class AuthInterceptor @Inject constructor(
         when (response.code) {
             CODE_TOKEN_EXPIRED -> {
                 try {
-                    val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody())
-                        .url("$AUTH_BASE_URL/auth/token")
-                        .addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() })
-                        .build()
-                    val refreshTokenResponse = chain.proceed(refreshTokenRequest)
-                    Timber.e("리프레시 토큰 : $refreshTokenResponse")
-
-                    if (refreshTokenResponse.isSuccessful) {
-                        val responseToken = json.decodeFromString(
-                            refreshTokenResponse.body?.string().toString()
-                        ) as BaseResponse<ResponseReIssueTokenDto>
-
-                        if (responseToken.data != null) {
-                            saveAccessToken(
-                                responseToken.data.accessToken,
-                                responseToken.data.refreshToken
-                            )
-                        }
-                        refreshTokenResponse.close()
-                        val newRequest = originalRequest.newAuthBuilder().build()
-                        return chain.proceed(newRequest)
-                    }
-                    saveAccessToken("", "")
+                    Timber.e("액세스 토큰 만료, 토큰 재발급 합니다.")
+                    response.close()
+                    return handleTokenExpired(chain, originalRequest, headerRequest)
                 } catch (t: Throwable) {
-                    Timber.e(t)
+                    Timber.e("예외발생 ${t.message}")
                     saveAccessToken("", "")
                 }
             }
@@ -73,14 +54,44 @@ class AuthInterceptor @Inject constructor(
     }
 
     private suspend fun getRefreshToken(): String {
-        return dataStoreRepository.getAccessToken().first() ?: ""
+        return dataStoreRepository.getRefreshToken().first() ?: ""
     }
 
     private fun saveAccessToken(accessToken: String, refreshToken: String) =
         runBlocking {
             dataStoreRepository.saveAccessToken(accessToken, refreshToken)
         }
 
+    private fun handleTokenExpired(chain: Interceptor.Chain, originalRequest: Request, headerRequest: Request): Response {
+        val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody())
+            .url("$AUTH_BASE_URL/auth/token")
+            .addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() })
+            .build()
+        val refreshTokenResponse = chain.proceed(refreshTokenRequest)
+        Timber.e("리프레시 토큰 : $refreshTokenResponse")
+
+        if (refreshTokenResponse.isSuccessful) {
+            val responseToken = json.decodeFromString(
+                refreshTokenResponse.body?.string().toString()
+            ) as BaseResponse<ResponseReIssueTokenDto>
+            if (responseToken.data != null) {
+                Timber.e("리프레시 토큰 : ${responseToken.data.refreshToken}")
+                saveAccessToken(
+                    responseToken.data.accessToken,
+                    responseToken.data.refreshToken
+                )
+            }
+            refreshTokenResponse.close()
+            val newRequest = originalRequest.newAuthBuilder().build()
+            return chain.proceed(newRequest)
+        } else {
+            refreshTokenResponse.close()
+            Timber.e("리프레시 토큰 : ${refreshTokenResponse.code}")
+            saveAccessToken("", "")
+            return chain.proceed(headerRequest)
+        }
+    }
+
     companion object {
         private const val HEADER_TOKEN = "accessToken"
         private const val CODE_TOKEN_EXPIRED = 401

app/src/main/java/com/android/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt

@@ -0,0 +1,12 @@
+package com.android.go.sopt.winey.data.model.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseLogoutDto(
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String
+)

app/src/main/java/com/android/go/sopt/winey/data/repository/AuthRepositoryImpl.kt

@@ -4,6 +4,7 @@ import com.android.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestLoginDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseLoginDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import com.android.go.sopt.winey.data.source.AuthDataSource
 import com.android.go.sopt.winey.domain.entity.Goal
@@ -37,6 +38,11 @@ class AuthRepositoryImpl @Inject constructor(
             authDataSource.postReIssueToken(refreshToken).data
         }
 
+    override suspend fun postLogout(): Result<ResponseLogoutDto> =
+        runCatching {
+            authDataSource.postLogout()
+        }
+
     override suspend fun getNicknameDuplicateCheck(nickname: String): Result<ResponseGetNicknameDuplicateCheckDto?> =
         runCatching {
             authDataSource.getNicknameDuplicateCheck(nickname).data

app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt

@@ -6,6 +6,7 @@ import com.android.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDt
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetUserDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseLoginDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import com.android.go.sopt.winey.data.model.remote.response.base.BaseResponse
 import retrofit2.http.Body
@@ -34,6 +35,9 @@ interface AuthService {
         @Header("refreshToken") refreshToken: String
     ): BaseResponse<ResponseReIssueTokenDto>
 
+    @POST("auth/sign-out")
+    suspend fun postLogout(): ResponseLogoutDto
+
     @GET("user/nickname/is-exist")
     suspend fun getNicknameDuplicateCheck(
         @Query("nickname") nickname: String

app/src/main/java/com/android/go/sopt/winey/data/source/AuthDataSource.kt

@@ -6,6 +6,7 @@ import com.android.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDt
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetUserDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseLoginDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import com.android.go.sopt.winey.data.model.remote.response.base.BaseResponse
 import com.android.go.sopt.winey.data.service.AuthService
@@ -30,6 +31,8 @@ class AuthDataSource @Inject constructor(
     ): BaseResponse<ResponseReIssueTokenDto> =
         authService.postReIssueToken(refreshToken)
 
+    suspend fun postLogout(): ResponseLogoutDto = authService.postLogout()
+
     suspend fun getNicknameDuplicateCheck(nickname: String): BaseResponse<ResponseGetNicknameDuplicateCheckDto> =
         authService.getNicknameDuplicateCheck(nickname)
 }

app/src/main/java/com/android/go/sopt/winey/domain/repository/AuthRepository.kt

@@ -4,6 +4,7 @@ import com.android.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestLoginDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseLoginDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import com.android.go.sopt.winey.domain.entity.Goal
 import com.android.go.sopt.winey.domain.entity.User
@@ -20,5 +21,7 @@ interface AuthRepository {
 
     suspend fun postReIssueToken(refreshToken: String): Result<ResponseReIssueTokenDto?>
 
+    suspend fun postLogout(): Result<ResponseLogoutDto>
+
     suspend fun getNicknameDuplicateCheck(nickname: String): Result<ResponseGetNicknameDuplicateCheckDto?>
 }

app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt

@@ -1,17 +1,27 @@
 package com.android.go.sopt.winey.presentation.main
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.fragment.app.replace
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import com.android.go.sopt.winey.R
 import com.android.go.sopt.winey.databinding.ActivityMainBinding
 import com.android.go.sopt.winey.presentation.main.feed.WineyFeedFragment
 import com.android.go.sopt.winey.presentation.main.mypage.MyPageFragment
 import com.android.go.sopt.winey.presentation.main.recommend.RecommendFragment
+import com.android.go.sopt.winey.presentation.onboarding.login.LoginActivity
 import com.android.go.sopt.winey.util.binding.BindingActivity
+import com.android.go.sopt.winey.util.context.snackBar
+import com.android.go.sopt.winey.util.view.UiState
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import retrofit2.HttpException
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main) {
@@ -23,6 +33,8 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         navigateTo<WineyFeedFragment>()
         initBnvItemSelectedListener()
         syncBottomNavigationSelection()
+        setupLogoutState()
+        setupTokenState()
     }
 
     private fun initBnvItemSelectedListener() {
@@ -51,6 +63,52 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         }
     }
 
+    fun setupLogoutState() {
+        viewModel.logoutState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                is UiState.Loading -> {
+                }
+
+                is UiState.Success -> {
+                    navigateToOnBoardingScreen()
+                    Timber.e("로그인 액티비티로 전환")
+                }
+
+                is UiState.Failure -> {
+                    snackBar(binding.root) { state.msg }
+                }
+
+                is UiState.Empty -> {
+                }
+            }
+        }.launchIn(lifecycleScope)
+    }
+
+    fun setupTokenState() {
+        viewModel.getUserState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                is UiState.Failure -> {
+                    if (state is HttpException) {
+                        if (state.code() == 401) {
+                            viewModel.postLogout()
+                        }
+                    }
+                }
+
+                else -> {
+                }
+            }
+        }
+    }
+
+    private fun navigateToOnBoardingScreen() {
+        Intent(this@MainActivity, LoginActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            startActivity(this)
+            finish()
+        }
+    }
+
     private inline fun <reified T : Fragment> navigateTo() {
         supportFragmentManager.commit {
             replace<T>(R.id.fcv_main, T::class.simpleName)

app/src/main/java/com/android/go/sopt/winey/presentation/main/MainViewModel.kt

@@ -2,6 +2,7 @@ package com.android.go.sopt.winey.presentation.main
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.android.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import com.android.go.sopt.winey.domain.entity.User
 import com.android.go.sopt.winey.domain.repository.AuthRepository
 import com.android.go.sopt.winey.domain.repository.DataStoreRepository
@@ -23,9 +24,8 @@ class MainViewModel @Inject constructor(
     private val _getUserState = MutableStateFlow<UiState<User?>>(UiState.Loading)
     val getUserState: StateFlow<UiState<User?>> = _getUserState.asStateFlow()
 
-    init {
-        getUser()
-    }
+    private val _logoutState = MutableStateFlow<UiState<ResponseLogoutDto?>>(UiState.Empty)
+    val logoutState: StateFlow<UiState<ResponseLogoutDto?>> = _logoutState.asStateFlow()
 
     fun getUser() {
         viewModelScope.launch {
@@ -39,11 +39,31 @@ class MainViewModel @Inject constructor(
                 }
                 .onFailure { t ->
                     if (t is HttpException) {
-                        Timber.e("HTTP 실패")
+                        Timber.e("HTTP 실패 ${t.code()}")
                     }
                     Timber.e("${t.message}")
                     _getUserState.value = UiState.Failure("${t.message}")
                 }
         }
     }
+
+    fun postLogout() {
+        viewModelScope.launch {
+            _logoutState.value = UiState.Loading
+
+            authRepository.postLogout()
+                .onSuccess { response ->
+                    dataStoreRepository.saveAccessToken("", "")
+                    _logoutState.value = UiState.Success(response)
+                    Timber.e("${response.message}")
+                }
+                .onFailure { t ->
+                    if (t is HttpException) {
+                        Timber.e("HTTP 실패")
+                    }
+                    Timber.e("${t.message}")
+                    _logoutState.value = UiState.Failure("${t.message}")
+                }
+        }
+    }
 }

app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt

@@ -37,6 +37,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
         init1On1ButtonClickListener()
         initLevelHelpButtonClickListener()
         initToMyFeedButtonClickListener()
+        initLogoutButtonClickListener()
         setupGetUserState()
         viewModel.getUser()
     }
@@ -66,6 +67,12 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
         }
     }
 
+    private fun initLogoutButtonClickListener() {
+        binding.clMypageLogout.setOnClickListener {
+            viewModel.postLogout()
+        }
+    }
+
     private fun setupGetUserState() {
         viewModel.getUserState.flowWithLifecycle(lifecycle).onEach { state ->
 

app/src/main/java/com/android/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt

@@ -62,6 +62,7 @@ class LoginViewModel @Inject constructor(
                     if (response != null) {
                         saveAccessToken(response.accessToken, response.refreshToken)
                         saveUserId(response.userId)
+                        Timber.e("액세스 : ${response.accessToken} , 리프레시 : ${response.refreshToken}")
                         _loginState.value = UiState.Success(response)
                     } else {
                         Timber.e("response is null")

app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt

@@ -9,7 +9,6 @@ import com.android.go.sopt.winey.databinding.ActivitySplashBinding
 import com.android.go.sopt.winey.domain.repository.DataStoreRepository
 import com.android.go.sopt.winey.presentation.main.MainActivity
 import com.android.go.sopt.winey.presentation.onboarding.login.LoginActivity
-import com.android.go.sopt.winey.presentation.onboarding.nickname.NicknameActivity
 import com.android.go.sopt.winey.util.binding.BindingActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
@@ -31,8 +30,7 @@ class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_
 
         lifecycleScope.launch {
             delay(DELAY_TIME)
-            //checkAutoLogin()
-            navigateTo<NicknameActivity>()
+            checkAutoLogin()
         }
     }