refactor: 로그아웃 구현

app/src/main/java/com/into/websoso/data/remote/api/AuthApi.kt

@@ -1,7 +1,6 @@
 package com.into.websoso.data.remote.api
 
 import com.into.websoso.data.remote.request.FCMTokenRequestDto
-import com.into.websoso.data.remote.request.LogoutRequestDto
 import com.into.websoso.data.remote.request.UserProfileRequestDto
 import com.into.websoso.data.remote.request.WithdrawRequestDto
 import com.into.websoso.data.remote.response.UserNicknameValidityResponseDto
@@ -24,12 +23,6 @@ interface AuthApi {
         @Body userProfileRequestDto: UserProfileRequestDto,
     )
 
-    @POST("auth/logout")
-    suspend fun logout(
-        @Header("Authorization") authorization: String,
-        @Body loginResponseDto: LogoutRequestDto,
-    )
-
     @POST("auth/withdraw")
     suspend fun withdraw(
         @Header("Authorization") authorization: String,

app/src/main/java/com/into/websoso/data/repository/AuthRepository.kt

@@ -3,7 +3,6 @@ package com.into.websoso.data.repository
 import android.content.SharedPreferences
 import com.into.websoso.data.remote.api.AuthApi
 import com.into.websoso.data.remote.request.FCMTokenRequestDto
-import com.into.websoso.data.remote.request.LogoutRequestDto
 import com.into.websoso.data.remote.request.UserProfileRequestDto
 import com.into.websoso.data.remote.request.WithdrawRequestDto
 import javax.inject.Inject
@@ -44,21 +43,6 @@ class AuthRepository
             )
         }
 
-        suspend fun logout(deviceIdentifier: String) {
-            runCatching {
-                if (accessToken.isNotEmpty() && refreshToken.isNotEmpty()) {
-                    authApi.logout(
-                        "Bearer $accessToken",
-                        LogoutRequestDto(refreshToken, deviceIdentifier),
-                    )
-                }
-            }.onSuccess {
-                clearTokens()
-            }.onFailure {
-                it.printStackTrace()
-            }
-        }
-
         suspend fun withdraw(reason: String) {
             runCatching {
                 if (accessToken.isNotEmpty() && refreshToken.isNotEmpty()) {

app/src/main/java/com/into/websoso/ui/accountInfo/AccountInfoViewModel.kt

@@ -1,13 +1,20 @@
 package com.into.websoso.ui.accountInfo
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.into.websoso.data.repository.AuthRepository
+import com.into.websoso.core.auth.AuthPlatform
+import com.into.websoso.data.account.AccountRepository
 import com.into.websoso.data.repository.PushMessageRepository
 import com.into.websoso.data.repository.UserRepository
+import com.into.websoso.ui.accountInfo.UiEffect.NavigateToLogin
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -16,14 +23,14 @@ class AccountInfoViewModel
     @Inject
     constructor(
         private val userRepository: UserRepository,
-        private val authRepository: AuthRepository,
         private val pushMessageRepository: PushMessageRepository,
+        private val accountRepository: AccountRepository,
     ) : ViewModel() {
-        private val _userEmail: MutableLiveData<String> = MutableLiveData()
-        val userEmail: LiveData<String> get() = _userEmail
+        private val _userEmail: MutableStateFlow<String> = MutableStateFlow("")
+        val userEmail: StateFlow<String> get() = _userEmail.asStateFlow()
 
-        private val _isLogoutSuccess: MutableLiveData<Boolean> = MutableLiveData(false)
-        val isLogoutSuccess: LiveData<Boolean> get() = _isLogoutSuccess
+        private var _uiEffect = Channel<UiEffect>(Channel.BUFFERED)
+        val uiEffect: Flow<UiEffect> get() = _uiEffect.receiveAsFlow()
 
         init {
             updateUserEmail()
@@ -34,23 +41,27 @@ class AccountInfoViewModel
                 runCatching {
                     userRepository.fetchUserInfoDetail()
                 }.onSuccess { userInfo ->
-                    _userEmail.value = userInfo.email
+                    _userEmail.update { userInfo.email }
                 }
             }
         }
 
-        fun logout() {
+        fun signOut(signOutToPlatform: suspend (platform: AuthPlatform) -> Unit) {
             viewModelScope.launch {
                 runCatching {
+                    signOutToPlatform(AuthPlatform.KAKAO)
                     val userDeviceIdentifier = userRepository.fetchUserDeviceIdentifier()
-                    authRepository.logout(userDeviceIdentifier)
+                    accountRepository.deleteToken(userDeviceIdentifier)
                 }.onSuccess {
-                    _isLogoutSuccess.value = true
-                    authRepository.updateIsAutoLogin(false)
                     pushMessageRepository.clearFCMToken()
+                    _uiEffect.send(NavigateToLogin)
                 }.onFailure {
-                    _isLogoutSuccess.value = false
+                    _uiEffect.send(NavigateToLogin)
                 }
             }
         }
     }
+
+sealed interface UiEffect {
+    data object NavigateToLogin : UiEffect
+}

app/src/main/java/com/into/websoso/ui/accountInfo/LogoutDialogFragment.kt

@@ -4,45 +4,55 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import com.into.websoso.R
+import com.into.websoso.core.auth.AuthClient
+import com.into.websoso.core.auth.AuthPlatform
+import com.into.websoso.core.common.navigator.NavigatorProvider
 import com.into.websoso.core.common.ui.base.BaseDialogFragment
 import com.into.websoso.core.common.util.SingleEventHandler
+import com.into.websoso.core.common.util.collectWithLifecycle
 import com.into.websoso.databinding.DialogLogoutBinding
-import com.into.websoso.ui.login.LoginActivity
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class LogoutDialogFragment : BaseDialogFragment<DialogLogoutBinding>(R.layout.dialog_logout) {
     private val accountInfoViewModel: AccountInfoViewModel by activityViewModels()
     private val singleEventHandler: SingleEventHandler by lazy { SingleEventHandler.from() }
 
+    @Inject
+    lateinit var authClient: Map<AuthPlatform, @JvmSuppressWildcards AuthClient>
+
+    @Inject
+    lateinit var websosoNavigator: NavigatorProvider
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.lifecycleOwner = this
-        onCancelButtonClick()
-        onLogoutButtonClick()
-        setupObserver()
+        setClickListener()
+        collectUiEffect()
     }
 
-    private fun setupObserver() {
-        accountInfoViewModel.isLogoutSuccess.observe(viewLifecycleOwner) { isSuccess ->
-            if (isSuccess) {
-                startActivity(LoginActivity.getIntent(requireContext()))
+    private fun collectUiEffect() {
+        accountInfoViewModel.uiEffect.collectWithLifecycle(viewLifecycleOwner) { uiEffect ->
+            when (uiEffect) {
+                UiEffect.NavigateToLogin -> websosoNavigator.navigateToLoginActivity()
             }
         }
     }
 
-    private fun onCancelButtonClick() {
+    private fun setClickListener() {
         binding.tvLogoutCancelButton.setOnClickListener {
             dismiss()
         }
-    }
 
-    private fun onLogoutButtonClick() {
         binding.tvLogoutButton.setOnClickListener {
             singleEventHandler.throttleFirst {
-                accountInfoViewModel.logout()
+                accountInfoViewModel.signOut { platform ->
+                    authClient[platform]?.signOut()
+                }
             }
         }
     }

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

@@ -9,9 +9,9 @@ import com.into.websoso.ui.splash.UiEffect.NavigateToLogin
 import com.into.websoso.ui.splash.UiEffect.NavigateToMain
 import com.into.websoso.ui.splash.UiEffect.ShowDialog
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -23,12 +23,14 @@ class SplashViewModel
         private val userRepository: UserRepository,
         private val accountRepository: AccountRepository,
     ) : ViewModel() {
-        private var _uiEffect: MutableSharedFlow<UiEffect> = MutableSharedFlow(replay = 1)
-        val uiEffect: SharedFlow<UiEffect> get() = _uiEffect.asSharedFlow()
+        private var _uiEffect = Channel<UiEffect>(Channel.BUFFERED)
+        val uiEffect: Flow<UiEffect> get() = _uiEffect.receiveAsFlow()
 
         init {
-            checkMinimumVersion()
-            handleAutoLogin()
+            viewModelScope.launch {
+                val isUpdateRequired = checkMinimumVersion()
+                if (isUpdateRequired.not()) handleAutoLogin()
+            }
         }
 
         fun updateUserDeviceIdentifier(deviceIdentifier: String) {
@@ -41,30 +43,25 @@ class SplashViewModel
             }
         }
 
-        private fun checkMinimumVersion() {
-            viewModelScope.launch {
-                runCatching {
-                    versionRepository.isUpdateRequired()
-                }.onSuccess { isRequired ->
-                    if (isRequired) _uiEffect.emit(ShowDialog)
-                }
+        private suspend fun checkMinimumVersion(): Boolean =
+            runCatching {
+                versionRepository.isUpdateRequired()
+            }.getOrElse { false }.also { isRequired ->
+                if (isRequired) _uiEffect.send(ShowDialog)
             }
-        }
 
-        private fun handleAutoLogin() {
-            viewModelScope.launch {
-                if (shouldRefresh()) {
-                    _uiEffect.emit(NavigateToLogin)
-                    return@launch
-                }
-
-                runCatching { accountRepository.renewToken() }
-                    .onSuccess {
-                        _uiEffect.emit(NavigateToMain)
-                    }.onFailure {
-                        _uiEffect.emit(NavigateToLogin)
-                    }
+        private suspend fun handleAutoLogin() {
+            if (shouldRefresh()) {
+                _uiEffect.send(NavigateToLogin)
+                return
             }
+
+            runCatching { accountRepository.renewToken() }
+                .onSuccess {
+                    _uiEffect.send(NavigateToMain)
+                }.onFailure {
+                    _uiEffect.send(NavigateToLogin)
+                }
         }
 
         private suspend fun shouldRefresh(): Boolean =

core/datastore/src/main/java/com/into/websoso/core/datastore/datasource/account/DefaultAccountDataSource.kt

@@ -44,6 +44,13 @@ internal class DefaultAccountDataSource
             }
         }
 
+        override suspend fun clearTokens() {
+            accountDataStore.edit { preferences ->
+                preferences.remove(ACCESS_TOKEN)
+                preferences.remove(REFRESH_TOKEN)
+            }
+        }
+
         companion object {
             private val ACCESS_TOKEN = stringPreferencesKey("ACCESS_TOKEN")
             private val REFRESH_TOKEN = stringPreferencesKey("REFRESH_TOKEN")

core/network/src/main/java/com/into/websoso/core/network/datasource/account/AccountApi.kt

@@ -1,6 +1,7 @@
 package com.into.websoso.core.network.datasource.account
 
 import com.into.websoso.core.network.datasource.account.model.KakaoLoginResponseDto
+import com.into.websoso.core.network.datasource.account.model.KakaoLogoutRequestDto
 import com.into.websoso.core.network.datasource.account.model.TokenReissueRequestDto
 import com.into.websoso.core.network.datasource.account.model.TokenReissueResponseDto
 import dagger.Module
@@ -19,6 +20,11 @@ internal interface AccountApi {
         @Header("Kakao-Access-Token") accessToken: String,
     ): KakaoLoginResponseDto
 
+    @POST("auth/logout")
+    suspend fun postLogoutWithKakao(
+        @Body kakaoLogoutRequestDto: KakaoLogoutRequestDto,
+    )
+
     @POST("reissue")
     suspend fun postReissueToken(
         @Body tokenReissueRequestDto: TokenReissueRequestDto,

core/network/src/main/java/com/into/websoso/core/network/datasource/account/DefaultAccountDataSource.kt

@@ -2,6 +2,7 @@ package com.into.websoso.core.network.datasource.account
 
 import com.into.websoso.core.auth.AuthPlatform
 import com.into.websoso.core.auth.AuthToken
+import com.into.websoso.core.network.datasource.account.model.KakaoLogoutRequestDto
 import com.into.websoso.core.network.datasource.account.model.TokenReissueRequestDto
 import com.into.websoso.data.account.datasource.AccountRemoteDataSource
 import com.into.websoso.data.account.model.AccountEntity
@@ -30,6 +31,18 @@ internal class DefaultAccountDataSource
                         ).toData()
             }
 
+        override suspend fun postLogout(
+            refreshToken: String,
+            deviceIdentifier: String,
+        ) {
+            accountApi.postLogoutWithKakao(
+                kakaoLogoutRequestDto = KakaoLogoutRequestDto(
+                    refreshToken = refreshToken,
+                    deviceIdentifier = deviceIdentifier,
+                ),
+            )
+        }
+
         override suspend fun postReissue(refreshToken: String): TokenEntity =
             accountApi
                 .postReissueToken(

app/src/main/java/com/into/websoso/data/remote/request/LogoutRequestDto.kt → core/network/src/main/java/com/into/websoso/core/network/datasource/account/model/KakaoLogoutRequestDto.kt

@@ -1,10 +1,10 @@
-package com.into.websoso.data.remote.request
+package com.into.websoso.core.network.datasource.account.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class LogoutRequestDto(
+internal data class KakaoLogoutRequestDto(
     @SerialName("refreshToken")
     val refreshToken: String,
     @SerialName("deviceIdentifier")

data/account/src/main/java/com/into/websoso/data/account/AccountRepository.kt

@@ -7,7 +7,7 @@ import com.into.websoso.data.account.datasource.AccountRemoteDataSource
 import javax.inject.Inject
 import javax.inject.Singleton
 
-// TODO: 인스턴스 싱글톤 참고하기
+// TODO: 인스턴스 싱글톤 참고하기, tokens 네이밍수정, result 객체 적용
 @Singleton
 class AccountRepository
     @Inject
@@ -34,6 +34,14 @@ class AccountRepository
             return account.isRegister
         }
 
+        suspend fun deleteToken(deviceIdentifier: String) {
+            accountRemoteDataSource
+                .postLogout(
+                    refreshToken = refreshToken(),
+                    deviceIdentifier = deviceIdentifier,
+                ).also { accountLocalDataSource.clearTokens() }
+        }
+
         suspend fun renewToken(): String {
             val tokens = accountRemoteDataSource.postReissue(refreshToken = refreshToken())
 

data/account/src/main/java/com/into/websoso/data/account/datasource/AccountLocalDataSource.kt

@@ -8,4 +8,6 @@ interface AccountLocalDataSource {
     suspend fun saveAccessToken(accessToken: String)
 
     suspend fun saveRefreshToken(refreshToken: String)
+
+    suspend fun clearTokens()
 }

data/account/src/main/java/com/into/websoso/data/account/datasource/AccountRemoteDataSource.kt

@@ -11,5 +11,10 @@ interface AccountRemoteDataSource {
         authToken: AuthToken,
     ): AccountEntity
 
+    suspend fun postLogout(
+        refreshToken: String,
+        deviceIdentifier: String,
+    )
+
     suspend fun postReissue(refreshToken: String): TokenEntity
 }