Merge pull request #517 from BCSDLab/fix/user_info_login

[Fix] 다른 계정으로 로그인 할 시 유저 정보 갱신 안되는 문제 수정
BCSDLab · Dec 24, 2024 · 09e1276 · 09e1276
2 parents d7e7439 + 00f867b
commit 09e1276
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/data/src/main/java/in/koreatech/koin/data/repository/UserRepositoryImpl.kt b/data/src/main/java/in/koreatech/koin/data/repository/UserRepositoryImpl.kt
@@ -2,9 +2,9 @@ package `in`.koreatech.koin.data.repository
 
 import `in`.koreatech.koin.data.mapper.toUser
 import `in`.koreatech.koin.data.mapper.toUserRequest
+import `in`.koreatech.koin.data.mapper.toUserRequestWithPassword
 import `in`.koreatech.koin.data.request.owner.OwnerLoginRequest
 import `in`.koreatech.koin.data.request.user.ABTestRequest
-import `in`.koreatech.koin.data.mapper.toUserRequestWithPassword
 import `in`.koreatech.koin.data.request.user.IdRequest
 import `in`.koreatech.koin.data.request.user.LoginRequest
 import `in`.koreatech.koin.data.request.user.PasswordRequest
@@ -43,18 +43,24 @@ class UserRepositoryImpl @Inject constructor(
     }
 
     override fun ownerTokenIsValid(): Boolean {
-        return runBlocking{
+        return runBlocking {
             try {
                 userRemoteDataSource.ownerTokenIsValid()
                 true
-            } catch (e: HttpException){
+            } catch (e: HttpException) {
                 if (e.code() == 401) false
                 else throw e
             }
 
         }
     }
 
+    override suspend fun fetchUserInfo() {
+        userRemoteDataSource.getUserInfo().toUser().also {
+            userLocalDataSource.updateUserInfo(it)
+        }
+    }
+
     override suspend fun getUserInfo(): User {
         return userRemoteDataSource.getUserInfo().toUser().also {
             userLocalDataSource.updateUserInfo(it)
@@ -131,6 +137,7 @@ class UserRepositoryImpl @Inject constructor(
             return ABTest(it.variableName, it.accessHistoryId)
         }
     }
+
     override suspend fun updateUserPassword(user: User, hashedPassword: String) {
         when (user) {
             User.Anonymous -> throw IllegalAccessException("Updating anonymous user is not supported")

diff --git a/domain/src/main/java/in/koreatech/koin/domain/repository/UserRepository.kt b/domain/src/main/java/in/koreatech/koin/domain/repository/UserRepository.kt
@@ -17,6 +17,7 @@ interface UserRepository {
     ): AuthToken
 
     fun ownerTokenIsValid(): Boolean
+    suspend fun fetchUserInfo()
     suspend fun getUserInfo(): User
     fun getUserInfoFlow(): Flow<User>
     suspend fun requestPasswordResetEmail(email: String)

diff --git a/domain/src/main/java/in/koreatech/koin/domain/usecase/user/UserLoginUseCase.kt b/domain/src/main/java/in/koreatech/koin/domain/usecase/user/UserLoginUseCase.kt
@@ -20,6 +20,7 @@ class UserLoginUseCase @Inject constructor(
             val authToken = userRepository.getToken(email, password.toSHA256())
             tokenRepository.saveAccessToken(authToken.token)
             tokenRepository.saveRefreshToken(authToken.refreshToken)
+            userRepository.fetchUserInfo()
             Unit to null
         } catch (throwable: Throwable) {
             null to userErrorHandler.handleGetTokenError(throwable)