#38 [FEAT] 카카오, 구글 로그인 실패 시 다이얼로그 구현

Author: gaeulzzang

presentation/src/main/java/com/sopt/presentation/auth/login/LogInRoute.kt

@@ -24,9 +24,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sopt.core.designsystem.component.dialog.NoostakDialog
 import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.toast
+import com.sopt.core.type.DialogType
 import com.sopt.presentation.R
 import com.sopt.presentation.auth.component.LoginButton
 
@@ -37,28 +39,37 @@ fun LoginRoute(
     loginViewModel: LoginViewModel = hiltViewModel()
 ) {
     val context = LocalContext.current
-
     val showDialog by loginViewModel.showDialog.collectAsStateWithLifecycle()
-    val dialogDescription by loginViewModel.dialogDescription.collectAsStateWithLifecycle()
 
     LaunchedEffect(loginViewModel.sideEffects) {
         loginViewModel.sideEffects.collect { sideEffect ->
             when (sideEffect) {
                 is LoginSideEffect.NavigateToHome -> navigateToHome()
                 is LoginSideEffect.NavigateSignUp -> navigateToSignUp(sideEffect.authId)
                 is LoginSideEffect.ShowToast -> context.toast(sideEffect.message)
+                is LoginSideEffect.ShowDialog -> loginViewModel.showDialog(
+                    sideEffect.dialogType,
+                    true
+                )
             }
         }
     }
 
-    if (showDialog) {
-        LoginFailureDialog(
-            onRetryRequest = { loginViewModel.googleLogin(context) },
-            onDismissRequest = { loginViewModel.showFailLoginDialog(false) },
-            description = stringResource(R.string.dialog_login_description, dialogDescription),
-            retryText = stringResource(R.string.dialog_login_retry),
-            dismissText = stringResource(R.string.dialog_login_dismiss)
-        )
+    showDialog.let { (dialogType, isVisible) ->
+        if (isVisible) {
+            NoostakDialog(
+                dialogType = dialogType,
+                onClick = {
+                    loginViewModel.showDialog(dialogType, false)
+                    when (dialogType) {
+                        DialogType.LOGIN_KAKAO -> loginViewModel.kakaoLogin(context)
+                        DialogType.LOGIN_GOOGLE -> loginViewModel.googleLogin(context)
+                        else -> Unit
+                    }
+                },
+                onDismissRequest = { loginViewModel.showDialog(dialogType, false) }
+            )
+        }
     }
 
     LoginScreen(

presentation/src/main/java/com/sopt/presentation/auth/login/LoginSideEffect.kt

@@ -1,6 +1,7 @@
 package com.sopt.presentation.auth.login
 
 import androidx.annotation.StringRes
+import com.sopt.core.type.DialogType
 
 sealed class LoginSideEffect {
     data object NavigateToHome : LoginSideEffect()
@@ -9,4 +10,6 @@ sealed class LoginSideEffect {
         @StringRes val message: Int,
         val args: String? = null
     ) : LoginSideEffect()
+
+    data class ShowDialog(val dialogType: DialogType) : LoginSideEffect()
 }

presentation/src/main/java/com/sopt/presentation/auth/login/LoginViewModel.kt

@@ -12,6 +12,7 @@ import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.kakao.sdk.user.UserApiClient
+import com.sopt.core.type.DialogType
 import com.sopt.core.type.SocialType
 import com.sopt.core.util.BaseViewModel
 import com.sopt.domain.entity.UserEntity
@@ -32,15 +33,11 @@ class LoginViewModel @Inject constructor(
     private val userInfoRepository: UserInfoRepository
 ) : BaseViewModel<LoginSideEffect>() {
 
-    private val _showDialog = MutableStateFlow(false)
-    val showDialog: StateFlow<Boolean> get() = _showDialog
+    private val _showDialog = MutableStateFlow(Pair(DialogType.LOGIN_GOOGLE, false))
+    val showDialog: StateFlow<Pair<DialogType, Boolean>> get() = _showDialog
 
-    private val _dialogDescription = MutableStateFlow("")
-    val dialogDescription: StateFlow<String> get() = _dialogDescription
-
-    fun showFailLoginDialog(show: Boolean, description: String = "") {
-        _showDialog.update { show }
-        _dialogDescription.update { description }
+    fun showDialog(dialogType: DialogType, isVisible: Boolean) {
+        _showDialog.update { it.copy(first = dialogType, second = isVisible) }
     }
 
     // Kakao Login
@@ -65,7 +62,7 @@ class LoginViewModel @Inject constructor(
 
                 error != null -> {
                     handleError(error, R.string.toast_kakao_login_failed)
-                    showFailLoginDialog(true, description = KAKAO)
+                    showDialog(DialogType.LOGIN_KAKAO, true)
                 }
             }
         }
@@ -91,7 +88,7 @@ class LoginViewModel @Inject constructor(
                 handleGoogleLoginResult(result.credential)
             }.onFailure { exception ->
                 handleError(exception, R.string.toast_google_login_failed)
-                showFailLoginDialog(true, description = GOOGLE)
+                showDialog(DialogType.LOGIN_GOOGLE, true)
             }
         }
     }
@@ -105,7 +102,7 @@ class LoginViewModel @Inject constructor(
                 R.string.toast_google_login_success
             )
         } else {
-            showFailLoginDialog(true, description = GOOGLE)
+            showDialog(DialogType.LOGIN_GOOGLE, true)
         }
     }