From d9eba304931dda3b1cad9ef76dc11bed3736a316 Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Tue, 15 Aug 2023 16:12:38 +0900 Subject: [PATCH] =?UTF-8?q?[chore]=20#105=20ktlint=20=EC=A0=9C=EC=95=88?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winey/data/interceptor/AuthInterceptor.kt | 53 +++++++++---------- .../remote/response/ResponseLogoutDto.kt | 4 +- .../go/sopt/winey/data/service/AuthService.kt | 1 + .../winey/presentation/main/MainActivity.kt | 2 - 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt b/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt index 538fcb30..f7c642a2 100644 --- a/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt +++ b/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt @@ -62,36 +62,35 @@ class AuthInterceptor @Inject constructor( dataStoreRepository.saveAccessToken(accessToken, refreshToken) } - private fun handleTokenExpired(chain: Interceptor.Chain, originalRequest: Request, headerRequest: Request): Response - { - val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody()) - .url("$AUTH_BASE_URL/auth/token") - .addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() }) - .build() - val refreshTokenResponse = chain.proceed(refreshTokenRequest) - Timber.e("리프레시 토큰 : $refreshTokenResponse") + private fun handleTokenExpired(chain: Interceptor.Chain, originalRequest: Request, headerRequest: Request): Response { + val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody()) + .url("$AUTH_BASE_URL/auth/token") + .addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() }) + .build() + val refreshTokenResponse = chain.proceed(refreshTokenRequest) + Timber.e("리프레시 토큰 : $refreshTokenResponse") - if (refreshTokenResponse.isSuccessful) { - val responseToken = json.decodeFromString( - refreshTokenResponse.body?.string().toString() - ) as BaseResponse - if (responseToken.data != null) { - Timber.e("리프레시 토큰 : ${responseToken.data.refreshToken}") - saveAccessToken( - responseToken.data.accessToken, - responseToken.data.refreshToken - ) - } - refreshTokenResponse.close() - val newRequest = originalRequest.newAuthBuilder().build() - return chain.proceed(newRequest) - } else { - refreshTokenResponse.close() - Timber.e("리프레시 토큰 : ${refreshTokenResponse.code}") - saveAccessToken("", "") - return chain.proceed(headerRequest) + if (refreshTokenResponse.isSuccessful) { + val responseToken = json.decodeFromString( + refreshTokenResponse.body?.string().toString() + ) as BaseResponse + if (responseToken.data != null) { + Timber.e("리프레시 토큰 : ${responseToken.data.refreshToken}") + saveAccessToken( + responseToken.data.accessToken, + responseToken.data.refreshToken + ) } + refreshTokenResponse.close() + val newRequest = originalRequest.newAuthBuilder().build() + return chain.proceed(newRequest) + } else { + refreshTokenResponse.close() + Timber.e("리프레시 토큰 : ${refreshTokenResponse.code}") + saveAccessToken("", "") + return chain.proceed(headerRequest) } + } companion object { private const val HEADER_TOKEN = "accessToken" diff --git a/app/src/main/java/com/android/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt b/app/src/main/java/com/android/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt index f92eb782..aee4de8e 100644 --- a/app/src/main/java/com/android/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt +++ b/app/src/main/java/com/android/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt @@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable @Serializable data class ResponseLogoutDto( @SerialName("code") - val code : Int, + val code: Int, @SerialName("message") - val message : String + val message: String ) diff --git a/app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt b/app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt index 2390704d..6baa78c2 100644 --- a/app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt +++ b/app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt @@ -37,6 +37,7 @@ interface AuthService { @POST("auth/sign-out") suspend fun postLogout(): ResponseLogoutDto + @GET("user/nickname/is-exist") suspend fun getNicknameDuplicateCheck( @Query("nickname") nickname: String diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt index 3729b4cc..d4afb9af 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt @@ -67,7 +67,6 @@ class MainActivity : BindingActivity(R.layout.activity_main viewModel.logoutState.flowWithLifecycle(lifecycle).onEach { state -> when (state) { is UiState.Loading -> { - } is UiState.Success -> { @@ -97,7 +96,6 @@ class MainActivity : BindingActivity(R.layout.activity_main } else -> { - } } }