[REFACTOR] #339 리뷰 간단사항 반영

Runnect · Mar 24, 2024 · 60bbd81 · 60bbd81
1 parent ead0369
commit 60bbd81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/app/src/main/java/com/runnect/runnect/data/service/AuthInterceptor.kt b/app/src/main/java/com/runnect/runnect/data/service/AuthInterceptor.kt
@@ -47,7 +47,7 @@ class AuthInterceptor @Inject constructor(
     private fun Request.newAuthTokenBuilder() =
         runBlocking(Dispatchers.IO) {
             val accessToken = getAccessToken()
-            val refreshToken = getRefreshToken()
+            val refreshToken = getNewToken()
             newBuilder().apply {
                 addHeader(ACCESS_TOKEN, accessToken)
                 addHeader(REFRESH_TOKEN, refreshToken)
@@ -62,7 +62,7 @@ class AuthInterceptor @Inject constructor(
         ) ?: ""
     }
 
-    private fun getRefreshToken(): String {
+    private fun getNewToken(): String {
         return PreferenceManager.getString(
             ApplicationClass.appContext,
             TOKEN_KEY_REFRESH
@@ -79,17 +79,17 @@ class AuthInterceptor @Inject constructor(
         originalRequest: Request,
         headerRequest: Request
     ): Response {
-        val refreshTokenResponse = getRefreshToken(originalRequest, chain)
+        val refreshTokenResponse = getNewToken(originalRequest, chain)
         return if (refreshTokenResponse.isSuccessful) {
             handleGetRefreshTokenSuccess(refreshTokenResponse, originalRequest, chain)
         } else {
             handleGetRefreshTokenFailure(refreshTokenResponse, headerRequest, chain)
         }
     }
 
-    private fun getRefreshToken(originalRequest: Request, chain: Interceptor.Chain): Response {
+    private fun getNewToken(originalRequest: Request, chain: Interceptor.Chain): Response {
         val baseUrl = ApplicationClass.getBaseUrl()
-        val refreshToken = getRefreshToken()
+        val refreshToken = getNewToken()
         val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody())
             .url("$baseUrl/api/auth/getNewToken")
             .addHeader(REFRESH_TOKEN, refreshToken)

diff --git a/app/src/main/java/com/runnect/runnect/presentation/login/LoginActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/login/LoginActivity.kt
@@ -19,6 +19,7 @@ import com.runnect.runnect.util.analytics.EventName.EVENT_CLICK_GOOGLE_LOGIN
 import com.runnect.runnect.util.analytics.EventName.EVENT_CLICK_KAKAO_LOGIN
 import com.runnect.runnect.util.analytics.EventName.EVENT_CLICK_VISITOR
 import com.runnect.runnect.util.analytics.EventName.EVENT_VIEW_SOCIAL_LOGIN
+import com.runnect.runnect.util.extension.showToast
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
@@ -39,16 +40,12 @@ class LoginActivity : BindingActivity<ActivityLoginBinding>(com.runnect.runnect.
             // visitor : 방문자모드
             // 나머지 : 바로 자동로그인 되므로 메인으로 이동
             if(accessToken.isBlank()){
-                Toast.makeText(
-                    this,
-                    getString(R.string.alert_need_to_re_sign),
-                    Toast.LENGTH_LONG
-                ).show()
+                showToast(getString(R.string.alert_need_to_re_sign))
             }
             else if (accessToken != "none" && accessToken != "visitor" ) {
                 Timber.d("자동로그인 완료")
                 moveToMain()
-                Toast.makeText(this@LoginActivity, MESSAGE_LOGIN_SUCCESS, Toast.LENGTH_SHORT).show()
+                showToast(MESSAGE_LOGIN_SUCCESS)
             }
         }
     }