#17 [REFACTOR] Kakao 로그인 로직 개선

Noostak · Jan 11, 2025 · c163649 · c163649
1 parent 7a94617
commit c163649
Showing 1 changed file with 25 additions and 32 deletions.
diff --git a/presentation/src/main/java/com/sopt/presentation/auth/login/LoginViewModel.kt b/presentation/src/main/java/com/sopt/presentation/auth/login/LoginViewModel.kt
@@ -18,45 +18,38 @@ class LoginViewModel @Inject constructor() : BaseViewModel<LoginSideEffect>() {
     private val _authId = MutableStateFlow("")
     val authId: StateFlow<String> = _authId
 
+    // Kakao Login
     fun kakaoLogin(context: Context) {
+        val loginCallback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+            handleKakaoLoginResult(token, error)
+        }
+
         if (UserApiClient.instance.isKakaoTalkLoginAvailable(context)) {
-            UserApiClient.instance.loginWithKakaoTalk(context) { token, error ->
-                handleKakaoLoginResult(token, error) {
-                    UserApiClient.instance.loginWithKakaoAccount(
-                        context,
-                        callback = ::handleKakaoLoginResult
-                    )
-                }
-            }
+            UserApiClient.instance.loginWithKakaoTalk(context, callback = loginCallback)
         } else {
-            UserApiClient.instance.loginWithKakaoAccount(
-                context,
-                callback = ::handleKakaoLoginResult
-            )
+            UserApiClient.instance.loginWithKakaoAccount(context, callback = loginCallback)
         }
     }
 
-    private fun handleKakaoLoginResult(
-        token: OAuthToken?,
-        error: Throwable?,
-        fallback: (() -> Unit)? = null
-    ) {
-        if (error != null) {
-            if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
-                emitSideEffect(LoginSideEffect.ShowToast(R.string.toast_login_cancelled))
-            } else {
-                emitSideEffect(
-                    LoginSideEffect.ShowToast(
-                        R.string.toast_kakao_login_failed,
-                        error.localizedMessage
-                    )
-                )
-                fallback?.invoke()
+    private fun handleKakaoLoginResult(token: OAuthToken?, error: Throwable?) {
+        when {
+            error != null -> {
+                handleKakaoError(error)
+            }
+
+            token != null -> {
+                _authId.value = token.accessToken
+                emitSideEffect(LoginSideEffect.ShowToast(R.string.toast_kakao_login_success))
+                navigateToSignup(_authId.value)
             }
-        } else if (token != null) {
-            _authId.value = token.accessToken
-            emitSideEffect(LoginSideEffect.ShowToast(R.string.toast_kakao_login_success))
-            navigateToSignup(_authId.value)
+        }
+    }
+
+    private fun handleKakaoError(error: Throwable) {
+        if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
+            emitSideEffect(LoginSideEffect.ShowToast(R.string.toast_login_cancelled))
+        } else {
+            emitSideEffect(LoginSideEffect.ShowToast(R.string.toast_kakao_login_failed))
         }
     }