From 000c9690bc9394ce2572bba0b6c35a8fb259de3d Mon Sep 17 00:00:00 2001 From: Covy Date: Tue, 12 Mar 2024 02:48:06 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20googleLogin=20Response=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#50)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: googleLogin Response 수정 * chore: response naming 변경 --- .../core/data/repository/DefaultTokenRepository.kt | 4 ++-- .../core/network/di/response/LoginResponse.kt | 11 +++++++++++ .../withpeace/core/network/di/service/AuthService.kt | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 core/network/src/main/java/com/withpeace/withpeace/core/network/di/response/LoginResponse.kt diff --git a/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt b/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt index 01ea0776..488e1b91 100644 --- a/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt +++ b/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/repository/DefaultTokenRepository.kt @@ -46,8 +46,8 @@ class DefaultTokenRepository @Inject constructor( ): Flow = 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 new file mode 100644 index 00000000..f5518b69 --- /dev/null +++ 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 index ab00be16..a1ef9cf4 100644 --- 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> + ): ApiResponse> @POST("/api/v1/auth/refresh") suspend fun refreshAccessToken(): ApiResponse>