feat: 로그아웃/회원 탈퇴 구현 완료 #68

Author: ikseong00

app/src/main/java/com/kuit/ourmenu/OurMenuApp.kt

@@ -1,12 +1,14 @@
 package com.kuit.ourmenu
 
 import android.app.Application
+import android.util.Log
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import coil3.memory.MemoryCache
 import coil3.util.DebugLogger
 import com.kakao.sdk.common.KakaoSdk
+import com.kakao.sdk.common.util.Utility
 import com.kakao.vectormap.KakaoMapSdk
 import dagger.hilt.android.HiltAndroidApp
 
@@ -16,11 +18,10 @@ class OurMenuApp : Application(), SingletonImageLoader.Factory {
         super.onCreate()
         KakaoSdk.init(this, BuildConfig.KAKAO_APP_KEY)
         KakaoMapSdk.init(this, BuildConfig.KAKAO_APP_KEY)
-        /*
-        * 이 부분을 주석 해제해서 keyHash 값 읽으시면 됩니다.
-        * val keyHash = Utility.getKeyHash(this)
-        * Log.d("KeyHash", keyHash)
-        * */
+        // 이 부분을 주석 해제해서 keyHash 값 읽으시면 됩니다
+        val keyHash = Utility.getKeyHash(this)
+        Log.d("KeyHash", keyHash)
+
 
     }
 

app/src/main/java/com/kuit/ourmenu/data/oauth/KakaoModule.kt

@@ -71,6 +71,7 @@ class KakaoRepository @Inject constructor(
     }
 
     fun logout(
+        successLogout: () -> Unit,
         errorLogout: (Throwable) -> Unit,
     ) {
         if (AuthApiClient.instance.hasToken()) {
@@ -80,12 +81,14 @@ class KakaoRepository @Inject constructor(
                     errorLogout(error)
                 } else {
                     Log.i("KakaoTag", "로그아웃 성공. SDK에서 토큰 삭제됨")
+                    successLogout()
                 }
             }
         }
     }
 
     fun unlink(
+        successUnlink: () -> Unit,
         errorUnlink: (Throwable) -> Unit,
     ) {
         if (AuthApiClient.instance.hasToken()) {
@@ -95,6 +98,7 @@ class KakaoRepository @Inject constructor(
                     errorUnlink(error)
                 } else {
                     Log.i("KakaoTag", "회원 탈퇴 성공. SDK에서 토큰 삭제됨")
+                    successUnlink()
                 }
             }
         }

app/src/main/java/com/kuit/ourmenu/data/repository/AuthRepository.kt

@@ -41,9 +41,6 @@ class AuthRepository @Inject constructor(
     }
 
     suspend fun logout() = runCatching {
-        kakaoRepository.logout { error ->
-            throw error
-        }
         authService.logout().handleBaseResponse().getOrThrow()
     }
 

app/src/main/java/com/kuit/ourmenu/data/repository/UserRepository.kt

@@ -42,9 +42,6 @@ class UserRepository @Inject constructor(
     }
 
     suspend fun deleteUser() = runCatching {
-        kakaoRepository.unlink { error ->
-            throw error
-        }
         userService.deleteUser().handleBaseResponse().getOrThrow()
     }
 }

app/src/main/java/com/kuit/ourmenu/ui/my/viewmodel/MyPageViewModel.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.kuit.ourmenu.data.model.auth.SignInType
-import com.kuit.ourmenu.data.model.base.OurMenuApiFailureException
 import com.kuit.ourmenu.data.oauth.KakaoRepository
 import com.kuit.ourmenu.data.repository.AuthRepository
 import com.kuit.ourmenu.data.repository.UserRepository
@@ -15,12 +14,14 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @HiltViewModel
 class MyPageViewModel @Inject constructor(
     private val userRepository: UserRepository,
     private val authRepository: AuthRepository,
+    private val kakaoRepository: KakaoRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(MyPageUiState())
@@ -101,29 +102,64 @@ class MyPageViewModel @Inject constructor(
 
     fun logout() {
         viewModelScope.launch {
-            authRepository.logout().fold(
-                onSuccess = {
-                    updateLogoutModalVisible(false)
-                    Log.d("MyPageViewModel", "logout: $it")
-                },
-                onFailure = {
-                    Log.d("MyPageViewModel", "logout: $it")
-                }
-            )
+            var kakaoResult = true
+
+            runBlocking {
+                kakaoRepository.logout(
+                    errorLogout = {
+                        Log.d("MyPageViewModel", "Kakao logout failed: $it")
+                        kakaoResult = false
+                    },
+                    successLogout = {
+                        Log.d("MyPageViewModel", "Kakao logout success")
+                        kakaoResult = true
+                    }
+                )
+            }
+
+            if (kakaoResult) {
+                authRepository.logout().fold(
+                    onSuccess = {
+                        Log.d("MyPageViewModel", "logout Success: $it")
+                        setLogoutSuccess()
+                    },
+                    onFailure = {
+                        Log.d("MyPageViewModel", "logout Failure: $it")
+                        kakaoRepository.getKakaoLogin { }
+                    }
+                )
+            }
         }
     }
 
     fun deleteAccount() {
         viewModelScope.launch {
-            userRepository.deleteUser().fold(
-                onSuccess = {
-                    updateDeleteAccountModalVisible(false)
-                    Log.d("MyPageViewModel", "deleteAccount: $it")
-                },
-                onFailure = {
-                    Log.d("MyPageViewModel", "deleteAccount: $it")
-                }
-            )
+            var kakaoResult = true
+
+            runBlocking {
+                kakaoRepository.unlink(
+                    errorUnlink = {
+                        Log.d("MyPageViewModel", "Kakao unlink failed: $it")
+                        kakaoResult = false
+                    },
+                    successUnlink = {
+                        Log.d("MyPageViewModel", "Kakao unlink success")
+                        kakaoResult = true
+                    }
+                )
+            }
+            if (kakaoResult) {
+                userRepository.deleteUser().fold(
+                    onSuccess = {
+                        Log.d("MyPageViewModel", "deleteAccount: $it")
+                        setDeleteAccountSuccess()
+                    },
+                    onFailure = {
+                        Log.d("MyPageViewModel", "deleteAccount: $it")
+                        kakaoRepository.getKakaoLogin { }
+                    }
+                )
+            }
         }
     }
 
@@ -172,6 +208,20 @@ class MyPageViewModel @Inject constructor(
         }
     }
 
+    fun setLogoutSuccess() {
+        updateLogoutModalVisible(false)
+        _uiState.update {
+            it.copy(isLogoutSuccess = true)
+        }
+    }
+
+    fun setDeleteAccountSuccess() {
+        updateDeleteAccountModalVisible(false)
+        _uiState.update {
+            it.copy(isDeleteAccountSuccess = true)
+        }
+    }
+
     fun updateLogoutModalVisible(visible: Boolean) {
         _uiState.update {
             it.copy(showLogoutModal = visible)