Merge pull request #48 from YAPP-Github/BOOK-142-refactor/#47

refactor: 로그인/로그아웃 로직 개선

Author: easyhooon

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt

@@ -1,10 +1,6 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.LoginModel
-
 interface AuthRepository {
-    suspend fun login(accessToken: String): Result<LoginModel>
+    suspend fun login(accessToken: String): Result<Unit>
     suspend fun logout(): Result<Unit>
-    suspend fun saveTokens(accessToken: String, refreshToken: String)
-    suspend fun clearTokens()
 }

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/mapper/ResponseToModel.kt

@@ -4,21 +4,12 @@ import com.ninecraft.booket.core.common.extensions.decodeHtmlEntities
 import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookSummaryModel
-import com.ninecraft.booket.core.model.LoginModel
 import com.ninecraft.booket.core.model.UserProfileModel
 import com.ninecraft.booket.core.network.response.BookDetailResponse
 import com.ninecraft.booket.core.network.response.BookSearchResponse
 import com.ninecraft.booket.core.network.response.BookSummary
-import com.ninecraft.booket.core.network.response.LoginResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 
-internal fun LoginResponse.toModel(): LoginModel {
-    return LoginModel(
-        accessToken = accessToken,
-        refreshToken = refreshToken,
-    )
-}
-
 internal fun UserProfileResponse.toModel(): UserProfileModel {
     return UserProfileModel(
         id = id,

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

@@ -2,7 +2,6 @@ package com.ninecraft.booket.core.data.impl.repository
 
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
-import com.ninecraft.booket.core.data.impl.mapper.toModel
 import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
 import com.ninecraft.booket.core.network.service.AuthService
@@ -17,26 +16,28 @@ internal class DefaultAuthRepository @Inject constructor(
     private val tokenDatasource: TokenPreferencesDataSource,
 ) : AuthRepository {
     override suspend fun login(accessToken: String) = runSuspendCatching {
-        noAuthService.login(
+        val response = noAuthService.login(
             LoginRequest(
                 providerType = KAKAO_PROVIDER_TYPE,
                 oauthToken = accessToken,
             ),
-        ).toModel()
+        )
+        saveTokens(response.accessToken, response.refreshToken)
     }
 
     override suspend fun logout() = runSuspendCatching {
         authService.logout()
+        clearTokens()
     }
 
-    override suspend fun saveTokens(accessToken: String, refreshToken: String) {
+    private suspend fun saveTokens(accessToken: String, refreshToken: String) {
         tokenDatasource.apply {
             setAccessToken(accessToken)
             setRefreshToken(refreshToken)
         }
     }
 
-    override suspend fun clearTokens() {
+    private suspend fun clearTokens() {
         tokenDatasource.clearTokens()
     }
 }

core/model/src/main/kotlin/com/ninecraft/booket/core/model/LoginModel.kt

@@ -87,7 +87,6 @@ class LibraryPresenter @AssistedInject constructor(
                             isLoading = true
                             authRepository.logout()
                                 .onSuccess {
-                                    authRepository.clearTokens()
                                     navigator.resetRoot(LoginScreen)
                                 }
                                 .onFailure { exception ->

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

@@ -49,9 +49,9 @@ class LoginPresenter @AssistedInject constructor(
                 is LoginUiEvent.Login -> {
                     scope.launch {
                         try {
+                            isLoading = true
                             repository.login(event.accessToken)
-                                .onSuccess { result ->
-                                    repository.saveTokens(result.accessToken, result.refreshToken)
+                                .onSuccess {
                                     navigator.goTo(TermsAgreementScreen)
                                 }.onFailure { exception ->
                                     exception.message?.let { Logger.e(it) }