[fix] #79 카카오 계정 관리 클래스 분리 및 인증 로직 수정

Author: Ojongseok

core/common/build.gradle.kts

@@ -10,7 +10,7 @@ android {
 
 dependencies {
     api(libs.timber)
+    api(libs.kakao.user)
     implementation(libs.androidx.security.crypto)
     implementation(libs.androidx.core.ktx)
-
 }

core/common/src/main/java/com/neki/android/core/common/kakao/KakaoAuthHelper.kt

@@ -0,0 +1,57 @@
+package com.neki.android.core.common.kakao
+
+import android.content.Context
+import com.kakao.sdk.user.UserApiClient
+
+class KakaoAuthHelper(
+    private val context: Context,
+) {
+    fun login(
+        onSuccess: (String) -> Unit,
+        onFailure: (String) -> Unit,
+    ) {
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(context)) {
+            UserApiClient.instance.loginWithKakaoTalk(context) { token, error ->
+                if (error != null) {
+                    onFailure(error.message ?: "카카오 로그인에 실패했습니다.")
+                } else if (token != null) {
+                    onSuccess(token.idToken!!)
+                }
+            }
+        } else {
+            UserApiClient.instance.loginWithKakaoAccount(context) { token, error ->
+                if (error != null) {
+                    onFailure(error.message ?: "카카오 로그인에 실패했습니다.")
+                } else if (token != null) {
+                    onSuccess(token.idToken!!)
+                }
+            }
+        }
+    }
+
+    fun logout(
+        onSuccess: () -> Unit,
+        onFailure: (String) -> Unit,
+    ) {
+        UserApiClient.instance.logout { error ->
+            if (error != null) {
+                onFailure(error.message ?: "카카오 로그아웃에 실패했습니다.")
+            } else {
+                onSuccess()
+            }
+        }
+    }
+
+    fun unlink(
+        onSuccess: () -> Unit,
+        onFailure: (String) -> Unit,
+    ) {
+        UserApiClient.instance.unlink { error ->
+            if (error != null) {
+                onFailure(error.message ?: "카카오 연결 해제에 실패했습니다.")
+            } else {
+                onSuccess()
+            }
+        }
+    }
+}

feature/auth/impl/build.gradle.kts

@@ -10,5 +10,4 @@ dependencies {
     implementation(libs.androidx.activity.compose)
 
     implementation(projects.feature.auth.api)
-    api(libs.kakao.user)
 }

feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/LoginScreen.kt

@@ -10,8 +10,8 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.neki.android.core.designsystem.ui.theme.NekiTheme
 import com.neki.android.core.ui.compose.collectWithLifecycle
+import com.neki.android.core.common.kakao.KakaoAuthHelper
 import com.neki.android.feature.auth.impl.component.LoginContent
-import com.neki.android.feature.auth.impl.util.KakaoLoginHelper
 import timber.log.Timber
 
 @Composable
@@ -22,13 +22,13 @@ fun LoginRoute(
     val uiState by viewModel.store.uiState.collectAsStateWithLifecycle()
 
     val context = LocalContext.current
-    val kakaoLoginHelper = remember { KakaoLoginHelper(context) }
+    val kakaoAuthHelper = remember { KakaoAuthHelper(context) }
 
     viewModel.store.sideEffects.collectWithLifecycle { sideEffect ->
         when (sideEffect) {
             LoginSideEffect.NavigateToHome -> navigateToMain()
             LoginSideEffect.NavigateToKakaoRedirectingUri -> {
-                kakaoLoginHelper.loginWithKakao(
+                kakaoAuthHelper.login(
                     onSuccess = { idToken ->
                         Timber.d("로그인 성공 $idToken")
                         viewModel.store.onIntent(LoginIntent.SuccessLogin(idToken))

feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/util/KakaoLoginHelper.kt

@@ -12,5 +12,4 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
     implementation(libs.oss.licenses)
-    implementation(libs.kakao.user)
 }

feature/mypage/impl/build.gradle.kts

@@ -70,4 +70,6 @@ sealed interface MyPageEffect {
     data class MoveAppSettings(val permission: NekiPermission) : MyPageEffect
     data class RequestPermission(val permission: NekiPermission) : MyPageEffect
     data object OpenOssLicenses : MyPageEffect
+    data object LogoutWithKakao : MyPageEffect
+    data object UnlinkWithKakao : MyPageEffect
 }

feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/MyPageContract.kt

@@ -177,7 +177,7 @@ internal class MyPageViewModel @Inject constructor(
 
     private fun logout(postSideEffect: (MyPageEffect) -> Unit) = viewModelScope.launch {
         tokenRepository.clearTokens()
-        postSideEffect(MyPageEffect.NavigateToLogin)
+        postSideEffect(MyPageEffect.LogoutWithKakao)
     }
 
     private fun withdrawAccount(
@@ -188,7 +188,8 @@ internal class MyPageViewModel @Inject constructor(
         authRepository.withdrawAccount()
             .onSuccess {
                 tokenRepository.clearTokens()
-                postSideEffect(MyPageEffect.NavigateToLogin)
+                reduce { copy(isLoading = false) }
+                postSideEffect(MyPageEffect.UnlinkWithKakao)
             }
             .onFailure {
                 Timber.e(it)

feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/MyPageViewModel.kt

@@ -4,8 +4,10 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.window.DialogProperties
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -22,6 +24,8 @@ import com.neki.android.feature.mypage.impl.main.MyPageState
 import com.neki.android.feature.mypage.impl.main.MyPageViewModel
 import com.neki.android.feature.mypage.impl.profile.component.ProfileSettingTopBar
 import com.neki.android.feature.mypage.impl.profile.component.SettingProfileImage
+import com.neki.android.core.common.kakao.KakaoAuthHelper
+import timber.log.Timber
 
 @Composable
 internal fun ProfileSettingRoute(
@@ -30,13 +34,27 @@ internal fun ProfileSettingRoute(
     navigateToEditProfile: () -> Unit,
     navigateToLogin: () -> Unit,
 ) {
+    val context = LocalContext.current
     val uiState by viewModel.store.uiState.collectAsStateWithLifecycle()
+    val kakaoAuthHelper = remember { KakaoAuthHelper(context) }
 
     viewModel.store.sideEffects.collectWithLifecycle { sideEffect ->
         when (sideEffect) {
             MyPageEffect.NavigateBack -> navigateBack()
             MyPageEffect.NavigateToEditProfile -> navigateToEditProfile()
             MyPageEffect.NavigateToLogin -> navigateToLogin()
+            MyPageEffect.LogoutWithKakao -> {
+                kakaoAuthHelper.logout(
+                    onSuccess = { navigateToLogin() },
+                    onFailure = { Timber.e(it) },
+                )
+            }
+            MyPageEffect.UnlinkWithKakao -> {
+                kakaoAuthHelper.unlink(
+                    onSuccess = { navigateToLogin() },
+                    onFailure = { Timber.e(it) },
+                )
+            }
             else -> {}
         }
     }