[chore] #105 ktlint 제안사항 수정

team-winey · Aug 15, 2023 · d9eba30 · d9eba30
1 parent 629ce82
commit d9eba30
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 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
@@ -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<ResponseReIssueTokenDto>
-                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<ResponseReIssueTokenDto>
+            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
@@ -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
@@ -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
@@ -67,7 +67,6 @@ class MainActivity : BindingActivity<ActivityMainBinding>(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<ActivityMainBinding>(R.layout.activity_main
                 }
 
                 else -> {
-
                 }
             }
         }