Refactor: 로그인 Intent 분리

LoginIntent를 세분화하여 각 상황에 맞는 Intent를 사용하도록 수정

Author: wjdrjs00

presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt

@@ -31,13 +31,13 @@ fun LoginScreenContainer(
         when (sideEffect) {
             is LoginSideEffect.RequestKakaoTalkLogin -> {
                 client.loginWithKakaoTalk(context) { token, error ->
-                    viewModel.sendIntent(LoginIntent.OnKakaoLoginResult(token, error))
+                    viewModel.kakaoLogin(token, error)
                 }
             }
 
             is LoginSideEffect.RequestKakaoAccountLogin -> {
                 client.loginWithKakaoAccount(context) { token, error ->
-                    viewModel.sendIntent(LoginIntent.OnKakaoLoginResult(token, error))
+                    viewModel.kakaoLogin(token, error)
                 }
             }
 

presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt

@@ -2,6 +2,8 @@ package com.threegap.bitnagil.presentation.login
 
 import android.util.Log
 import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.threegap.bitnagil.domain.auth.usecase.LoginUseCase
@@ -11,9 +13,8 @@ import com.threegap.bitnagil.presentation.login.model.LoginIntent
 import com.threegap.bitnagil.presentation.login.model.LoginSideEffect
 import com.threegap.bitnagil.presentation.login.model.LoginState
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
-import org.orbitmvi.orbit.syntax.simple.intent
-import org.orbitmvi.orbit.syntax.simple.reduce
 import javax.inject.Inject
 
 @HiltViewModel
@@ -38,66 +39,66 @@ class LoginViewModel @Inject constructor(
                 null
             }
 
-            is LoginIntent.OnKakaoLoginResult -> {
-                intent { handleKakaoLoginResult(intent) }
-                null
+            is LoginIntent.SetLoading -> {
+                state.copy(isLoading = intent.isLoading)
             }
-        }
 
-    private suspend fun SimpleSyntax<LoginState, LoginSideEffect>.handleKakaoLoginResult(
-        intent: LoginIntent.OnKakaoLoginResult,
-    ) {
-        reduce { state.copy(isLoading = true) }
-
-        when {
-            intent.token != null -> {
-                processBitnagilLogin(
-                    socialAccessToken = intent.token.accessToken,
-                    socialType = "KAKAO",
+            is LoginIntent.LoginSuccess -> {
+                sendSideEffect(
+                    if (intent.isGuest) {
+                        LoginSideEffect.NavigateToTermsOfService
+                    } else {
+                        LoginSideEffect.NavigateToHome
+                    },
+                )
+                state.copy(
+                    isGuest = intent.isGuest,
+                    isLoading = false,
                 )
             }
 
-            intent.error is ClientError && intent.error.reason == ClientErrorCause.Cancelled -> {
-                Log.e("KakaoLogin", "로그인 취소", intent.error)
-                reduce { state.copy(isLoading = false) }
+            is LoginIntent.KakaoTalkLoginCancel -> {
+                sendSideEffect(LoginSideEffect.RequestKakaoAccountLogin)
+                state.copy(isLoading = false)
             }
 
-            intent.error != null -> {
-                Log.e("KakaoLogin", "로그인 실패", intent.error)
-                reduce { state.copy(isLoading = false) }
+            is LoginIntent.LoginFailure -> {
+                state.copy(isLoading = false)
+            }
+        }
+
+    fun kakaoLogin(token: OAuthToken?, error: Throwable?) {
+        viewModelScope.launch {
+            sendIntent(LoginIntent.SetLoading(true))
+            when {
+                token != null -> {
+                    processKakaoLoginSuccess(token)
+                }
+
+                error is ClientError && error.reason == ClientErrorCause.Cancelled -> {
+                    Log.e("KakaoLogin", "카카오 로그인 취소", error)
+                    sendIntent(LoginIntent.KakaoTalkLoginCancel)
+                }
+
+                error != null -> {
+                    Log.e("KakaoLogin", "카카오 로그인 실패", error)
+                    sendIntent(LoginIntent.LoginFailure)
+                }
             }
         }
     }
 
-    private suspend fun SimpleSyntax<LoginState, LoginSideEffect>.processBitnagilLogin(
-        socialAccessToken: String,
-        socialType: String,
-    ) {
+    private suspend fun processKakaoLoginSuccess(token: OAuthToken) {
         loginUseCase(
-            socialAccessToken = socialAccessToken,
-            socialType = socialType,
+            socialAccessToken = token.accessToken,
+            socialType = "KAKAO",
         ).fold(
             onSuccess = {
                 val isGuest = it.role.isGuest()
-
-                reduce {
-                    state.copy(
-                        isGuest = isGuest,
-                        isLoading = false,
-                    )
-                }
-
-                sendSideEffect(
-                    if (isGuest) {
-                        LoginSideEffect.NavigateToTermsOfService
-                    } else {
-                        LoginSideEffect.NavigateToHome
-                    },
-                )
+                sendIntent(LoginIntent.LoginSuccess(isGuest = isGuest))
             },
             onFailure = { e ->
-                reduce { state.copy(isLoading = false) }
-
+                sendIntent(LoginIntent.LoginFailure)
                 if (e is BitnagilError) {
                     Log.e("Login", "${e.code} ${e.message}")
                 }

presentation/src/main/java/com/threegap/bitnagil/presentation/login/model/LoginIntent.kt

@@ -1,13 +1,11 @@
 package com.threegap.bitnagil.presentation.login.model
 
-import com.kakao.sdk.auth.model.OAuthToken
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviIntent
 
 sealed class LoginIntent : MviIntent {
     data class OnKakaoLoginClick(val onKakaoTalkLoginAvailable: Boolean) : LoginIntent()
-
-    data class OnKakaoLoginResult(
-        val token: OAuthToken?,
-        val error: Throwable?,
-    ) : LoginIntent()
+    data class SetLoading(val isLoading: Boolean) : LoginIntent()
+    data class LoginSuccess(val isGuest: Boolean) : LoginIntent()
+    data object KakaoTalkLoginCancel : LoginIntent()
+    data object LoginFailure : LoginIntent()
 }