feat/#66: 로그아웃 기능 일부 구현

jinukeu · jinukeu · commit bc5ea6685a1b · 2025-01-30T17:21:26.000+09:00
diff --git a/core/data-api/src/main/java/com/yapp/data_api/MyClass.kt b/core/data-api/src/main/java/com/yapp/data_api/MyClass.kt
diff --git a/core/data-api/src/main/java/com/yapp/dataapi/AuthorizedUserRepository.kt b/core/data-api/src/main/java/com/yapp/dataapi/AuthorizedUserRepository.kt
@@ -0,0 +1,5 @@
+package com.yapp.dataapi
+
+interface AuthorizedUserRepository {
+    suspend fun clearTokens()
+}
diff --git a/core/data-api/src/main/java/com/yapp/dataapi/UnAuthorizedUserRepository.kt b/core/data-api/src/main/java/com/yapp/dataapi/UnAuthorizedUserRepository.kt
@@ -1,4 +1,4 @@
-package com.yapp.data_api
+package com.yapp.dataapi
 
 import com.yapp.model.SignUpInfo
 import com.yapp.model.SignUpResult
diff --git a/core/data/src/main/java/com/yapp/core/data/data/di/RepositoryModule.kt b/core/data/src/main/java/com/yapp/core/data/data/di/RepositoryModule.kt
@@ -1,7 +1,9 @@
 package com.yapp.core.data.data.di
 
+import com.yapp.core.data.data.repository.AuthorizedUserRepositoryImpl
 import com.yapp.core.data.data.repository.UnAuthorizedUserRepositoryImpl
-import com.yapp.data_api.UnAuthorizedUserRepository
+import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.UnAuthorizedUserRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,6 +15,11 @@ internal abstract class RepositoryModule {
 
     @Binds
     abstract fun bindUnAuthorizedUserRepositoryImpl(
-        unAuthorizedUserRepositoryImpl: UnAuthorizedUserRepositoryImpl,
+        repositoryImpl: UnAuthorizedUserRepositoryImpl,
     ): UnAuthorizedUserRepository
+
+    @Binds
+    abstract fun bindAuthorizedUserRepositoryImpl(
+        repositoryImpl: AuthorizedUserRepositoryImpl,
+    ): AuthorizedUserRepository
 }
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/AuthorizedUserRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/AuthorizedUserRepositoryImpl.kt
@@ -0,0 +1,21 @@
+package com.yapp.core.data.data.repository
+
+import com.yapp.core.data.local.SecurityPreferences
+import com.yapp.core.data.remote.api.UnAuthorizedUserApi
+import com.yapp.core.data.remote.model.request.toData
+import com.yapp.core.data.remote.model.response.toModel
+import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.UnAuthorizedUserRepository
+import com.yapp.model.SignUpInfo
+import com.yapp.model.SignUpResult
+import javax.inject.Inject
+import kotlin.jvm.optionals.getOrNull
+
+internal class AuthorizedUserRepositoryImpl @Inject constructor(
+    private val securityPreferences: SecurityPreferences,
+): AuthorizedUserRepository {
+
+    override suspend fun clearTokens() {
+        securityPreferences.clearAll()
+    }
+}
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/UnAuthorizedUserRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/UnAuthorizedUserRepositoryImpl.kt
@@ -4,7 +4,7 @@ import com.yapp.core.data.local.SecurityPreferences
 import com.yapp.core.data.remote.api.UnAuthorizedUserApi
 import com.yapp.core.data.remote.model.request.toData
 import com.yapp.core.data.remote.model.response.toModel
-import com.yapp.data_api.UnAuthorizedUserRepository
+import com.yapp.dataapi.UnAuthorizedUserRepository
 import com.yapp.model.SignUpInfo
 import com.yapp.model.SignUpResult
 import javax.inject.Inject
diff --git a/core/domain/src/main/java/com/yapp/domain/LogoutUseCase.kt b/core/domain/src/main/java/com/yapp/domain/LogoutUseCase.kt
@@ -0,0 +1,12 @@
+package com.yapp.domain
+
+import com.yapp.dataapi.AuthorizedUserRepository
+import javax.inject.Inject
+
+class LogoutUseCase @Inject constructor(
+    private val authorizedUserRepository: AuthorizedUserRepository,
+) {
+    suspend operator fun invoke() = runCatchingIgnoreCancelled {
+        authorizedUserRepository.clearTokens()
+    }
+}
diff --git a/core/domain/src/main/java/com/yapp/domain/SignUpUseCase.kt b/core/domain/src/main/java/com/yapp/domain/SignUpUseCase.kt
@@ -1,8 +1,7 @@
 package com.yapp.domain
 
-import com.yapp.data_api.UnAuthorizedUserRepository
+import com.yapp.dataapi.UnAuthorizedUserRepository
 import com.yapp.model.SignUpInfo
-import kotlinx.coroutines.delay
 import javax.inject.Inject
 
 class SignUpUseCase @Inject constructor(
diff --git a/feature/home/src/main/java/com/yapp/feature/home/setting/SettingContract.kt b/feature/home/src/main/java/com/yapp/feature/home/setting/SettingContract.kt
@@ -27,4 +27,5 @@ sealed interface SettingSideEffect {
     data object OpenPrivacyPolicy : SettingSideEffect
     data object OpenTerms : SettingSideEffect
     data object OpenInquiry : SettingSideEffect
+    data object NavigateToLogin : SettingSideEffect
 }
diff --git a/feature/home/src/main/java/com/yapp/feature/home/setting/SettingScreen.kt b/feature/home/src/main/java/com/yapp/feature/home/setting/SettingScreen.kt
@@ -57,6 +57,9 @@ fun SettingRoute(
 
             SettingSideEffect.OpenInquiry -> {
             }
+
+            SettingSideEffect.NavigateToLogin -> {
+            }
         }
     }
 
diff --git a/feature/home/src/main/java/com/yapp/feature/home/setting/SettingViewModel.kt b/feature/home/src/main/java/com/yapp/feature/home/setting/SettingViewModel.kt
@@ -1,13 +1,19 @@
 package com.yapp.feature.home.setting
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.yapp.core.ui.mvi.MviIntentStore
 import com.yapp.core.ui.mvi.mviIntentStore
+import com.yapp.domain.LogoutUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class SettingViewModel @Inject constructor() : ViewModel() {
+class SettingViewModel @Inject constructor(
+    private val logoutUseCase: LogoutUseCase,
+) : ViewModel() {
 
     val store: MviIntentStore<SettingState, SettingIntent, SettingSideEffect> =
         mviIntentStore(
@@ -23,6 +29,7 @@ class SettingViewModel @Inject constructor() : ViewModel() {
     ) {
         when (intent) {
             is SettingIntent.ClickNotificationSwitch -> {
+                // TODO 서버 API 호출
                 reduce { copy(isNotificationEnabled = intent.enabled) }
             }
             SettingIntent.ClickLogoutButton -> {
@@ -55,7 +62,13 @@ class SettingViewModel @Inject constructor() : ViewModel() {
             }
 
             SettingIntent.ClickDeleteAccountDialogRecommendActionButton -> TODO()
-            SettingIntent.ClickLogoutDialogRecommendActionButton -> TODO()
+
+            SettingIntent.ClickLogoutDialogRecommendActionButton -> {
+                viewModelScope.launch {
+                    logoutUseCase()
+                    postSideEffect(SettingSideEffect.NavigateToLogin)
+                }
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.yapp.data_api`
	`1`	`+package com.yapp.dataapi`
`2`	`2`
`3`	`3`	`import com.yapp.model.SignUpInfo`
`4`	`4`	`import com.yapp.model.SignUpResult`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,5 @@ sealed interface SettingSideEffect {`
`27`	`27`	`data object OpenPrivacyPolicy : SettingSideEffect`
`28`	`28`	`data object OpenTerms : SettingSideEffect`
`29`	`29`	`data object OpenInquiry : SettingSideEffect`
	`30`	`+ data object NavigateToLogin : SettingSideEffect`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ fun SettingRoute(`
`57`	`57`
`58`	`58`	`SettingSideEffect.OpenInquiry -> {`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ SettingSideEffect.NavigateToLogin -> {`
	`62`	`+ }`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`