refactor: googleLogin Response 수정 (#50)

* refactor: googleLogin Response 수정 * chore: response naming 변경
WithPeace · Mar 11, 2024 · 000c969 · 000c969
1 parent e8e7de5
commit 000c969
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...ta/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt b/...ta/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt
@@ -46,8 +46,8 @@ class DefaultTokenRepository @Inject constructor(
     ): Flow<Unit> = flow {
         authService.googleLogin(AUTHORIZATION_FORMAT.format(idToken)).suspendMapSuccess {
             val data = this.data
-            tokenPreferenceDataSource.updateAccessToken(data.accessToken)
-            tokenPreferenceDataSource.updateRefreshToken(data.refreshToken)
+            tokenPreferenceDataSource.updateAccessToken(data.tokenResponse.accessToken)
+            tokenPreferenceDataSource.updateRefreshToken(data.tokenResponse.refreshToken)
             emit(Unit)
         }.suspendOnFailure { onError(message()) }
     }.flowOn(Dispatchers.IO)

diff --git a/core/network/src/main/java/com/withpeace/withpeace/core/network/di/response/LoginResponse.kt b/core/network/src/main/java/com/withpeace/withpeace/core/network/di/response/LoginResponse.kt
@@ -0,0 +1,11 @@
+package com.withpeace.withpeace.core.network.di.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LoginResponse(
+    @SerialName("jwtTokenDto")
+    val tokenResponse: TokenResponse,
+    val role: String,
+)
diff --git a/core/network/src/main/java/com/withpeace/withpeace/core/network/di/service/AuthService.kt b/core/network/src/main/java/com/withpeace/withpeace/core/network/di/service/AuthService.kt
@@ -2,6 +2,7 @@ package com.withpeace.withpeace.core.network.di.service
 
 import com.skydoves.sandwich.ApiResponse
 import com.withpeace.withpeace.core.network.di.response.BaseResponse
+import com.withpeace.withpeace.core.network.di.response.LoginResponse
 import com.withpeace.withpeace.core.network.di.response.TokenResponse
 import retrofit2.http.Header
 import retrofit2.http.POST
@@ -12,7 +13,7 @@ interface AuthService {
     suspend fun googleLogin(
         @Header("Authorization")
         idToken: String,
-    ): ApiResponse<BaseResponse<TokenResponse>>
+    ): ApiResponse<BaseResponse<LoginResponse>>
 
     @POST("/api/v1/auth/refresh")
     suspend fun refreshAccessToken(): ApiResponse<BaseResponse<TokenResponse>>