Merge pull request #27 from YAPP-Github/BOOK-89-feature/#26

easyhooon · web-flow · commit 9d453231618f · 2025-07-04T15:36:10.000+09:00
feat: AccessToken 갱신을 통한 API 자동 재시도 로직 구현
diff --git a/core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/HandleException.kt b/core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/HandleException.kt
@@ -6,31 +6,31 @@ import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
-interface ErrorHandlerActions {
-    fun setServerErrorDialogVisible(flag: Boolean)
-    fun setNetworkErrorDialogVisible(flag: Boolean)
-}
+fun handleException(
+    exception: Throwable,
+    onLoginRequired: () -> Unit,
+    onServerError: (String) -> Unit,
+    onNetworkError: (String) -> Unit,
+) {
+    when {
+        exception is HttpException && exception.code() == 401 -> {
+            onLoginRequired()
+        }
 
-fun handleException(exception: Throwable, actions: ErrorHandlerActions) {
-    when (exception) {
-        is HttpException -> {
-            if (exception.code() in 500..599) {
-                actions.setServerErrorDialogVisible(true)
-            } else {
-                exception.message?.let { Logger.e(it) }
-            }
+        exception is HttpException && exception.code() in 500..599 -> {
+            onServerError("서버 오류가 발생했습니다.")
         }
 
-        is UnknownHostException, is ConnectException -> {
-            actions.setNetworkErrorDialogVisible(true)
+        exception is UnknownHostException || exception is ConnectException -> {
+            onNetworkError("네트워크 연결을 확인해주세요.")
         }
 
-        is SocketTimeoutException -> {
-            actions.setServerErrorDialogVisible(true)
+        exception is SocketTimeoutException -> {
+            onServerError("서버 응답 시간이 초과되었습니다.")
         }
 
         else -> {
-            exception.message?.let { Logger.e(it) }
+            Logger.e(exception.message ?: "알 수 없는 오류가 발생했습니다.")
         }
     }
 }
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenAuthenticator.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenAuthenticator.kt
@@ -0,0 +1,52 @@
+package com.ninecraft.booket.core.network
+
+import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.network.request.RefreshTokenRequest
+import com.ninecraft.booket.core.network.service.NoAuthService
+import com.orhanobut.logger.Logger
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+@Suppress("TooGenericExceptionCaught")
+class TokenAuthenticator @Inject constructor(
+    private val tokenDataSource: TokenPreferencesDataSource,
+    private val noAuthService: NoAuthService,
+) : Authenticator {
+    override fun authenticate(route: Route?, response: Response): Request? {
+        return runBlocking {
+            try {
+                val refreshToken = tokenDataSource.getRefreshToken()
+
+                if (refreshToken.isBlank()) {
+                    Logger.d("TokenAuthenticator", "No refresh token available")
+                    tokenDataSource.clearTokens()
+                    return@runBlocking null
+                }
+
+                val refreshTokenRequest = RefreshTokenRequest(refreshToken)
+                val refreshResponse = noAuthService.refreshToken(refreshTokenRequest)
+
+                tokenDataSource.apply {
+                    setAccessToken(refreshResponse.accessToken)
+                    setRefreshToken(refreshResponse.refreshToken)
+                }
+
+                Logger.d("TokenAuthenticator", "Token refreshed successfully")
+
+                response.request.newBuilder()
+                    .header("Authorization", "Bearer ${refreshResponse.accessToken}")
+                    .build()
+            } catch (e: Exception) {
+                Logger.e("TokenAuthenticator", e.message)
+                tokenDataSource.clearTokens()
+
+                // refresh token이 만료되었거나 잘못된 경우, 재시도하지 않음
+                return@runBlocking null
+            }
+        }
+    }
+}
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/NetworkModule.kt
@@ -13,6 +13,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.ninecraft.booket.core.network.BuildConfig
 import com.ninecraft.booket.core.network.TokenInterceptor
+import com.ninecraft.booket.core.network.TokenAuthenticator
 import com.ninecraft.booket.core.network.service.AuthService
 import com.ninecraft.booket.core.network.service.NoAuthService
 import com.orhanobut.logger.AndroidLogAdapter
@@ -32,6 +33,20 @@ private val jsonRule = Json {
 
 private val jsonConverterFactory = jsonRule.asConverterFactory("application/json".toMediaType())
 
+private val FILTERED_HEADERS = setOf(
+    "transfer-encoding",
+    "connection",
+    "x-content-type-options",
+    "x-xss-protection",
+    "cache-control",
+    "pragma",
+    "expires",
+    "x-frame-options",
+    "keep-alive",
+    "server",
+    "content-length",
+)
+
 @Module
 @InstallIn(SingletonComponent::class)
 internal object NetworkModule {
@@ -55,7 +70,14 @@ internal object NetworkModule {
         networkLogAdapter: AndroidLogAdapter,
     ): HttpLoggingInterceptor {
         return HttpLoggingInterceptor { message ->
-            if (message.isNotBlank()) {
+            val shouldFilter = FILTERED_HEADERS.any { header ->
+                message.lowercase().contains("$header:")
+            }
+
+            val isDuplicateContentType = message.lowercase().contains("content-type: application/json") &&
+                !message.contains("charset")
+
+            if (!shouldFilter && !isDuplicateContentType && message.isNotBlank()) {
                 networkLogAdapter.log(Log.DEBUG, null, message)
             }
         }.apply {
@@ -73,12 +95,14 @@ internal object NetworkModule {
     internal fun provideAuthOkHttpClient(
         httpLoggingInterceptor: HttpLoggingInterceptor,
         tokenInterceptor: TokenInterceptor,
+        tokenAuthenticator: TokenAuthenticator,
     ): OkHttpClient {
         return OkHttpClient.Builder()
             .connectTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
             .readTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
             .writeTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
             .addInterceptor(tokenInterceptor)
+            .authenticator(tokenAuthenticator)
             .addInterceptor(httpLoggingInterceptor)
             .build()
     }
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/request/RefreshTokenRequest.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/request/RefreshTokenRequest.kt
@@ -0,0 +1,10 @@
+package com.ninecraft.booket.core.network.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RefreshTokenRequest(
+    @SerialName("refreshToken")
+    val refreshToken: String,
+)
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/response/RefreshTokenResponse.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/response/RefreshTokenResponse.kt
@@ -0,0 +1,12 @@
+package com.ninecraft.booket.core.network.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RefreshTokenResponse(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+)
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/NoAuthService.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/NoAuthService.kt
@@ -1,11 +1,16 @@
 package com.ninecraft.booket.core.network.service
 
 import com.ninecraft.booket.core.network.request.LoginRequest
+import com.ninecraft.booket.core.network.request.RefreshTokenRequest
 import com.ninecraft.booket.core.network.response.LoginResponse
+import com.ninecraft.booket.core.network.response.RefreshTokenResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface NoAuthService {
     @POST("api/v1/auth/signin")
     suspend fun login(@Body loginRequest: LoginRequest): LoginResponse
+
+    @POST("api/v1/auth/refresh")
+    suspend fun refreshToken(@Body refreshTokenRequest: RefreshTokenRequest): RefreshTokenResponse
 }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.feature.login.LoginScreen
 import com.orhanobut.logger.Logger
@@ -43,11 +44,21 @@ class LibraryPresenter @AssistedInject constructor(
                                 .onSuccess {
                                     repository.clearTokens()
                                     navigator.resetRoot(LoginScreen)
-                                }.onFailure { exception ->
-                                    exception.message?.let { Logger.e(it) }
-                                    sideEffect = exception.message?.let {
-                                        LibraryScreen.SideEffect.ShowToast(it)
+                                }
+                                .onFailure { exception ->
+                                    val handleErrorMessage = { message: String ->
+                                        Logger.e(message)
+                                        sideEffect = LibraryScreen.SideEffect.ShowToast(message)
                                     }
+
+                                    handleException(
+                                        exception = exception,
+                                        onServerError = handleErrorMessage,
+                                        onNetworkError = handleErrorMessage,
+                                        onLoginRequired = {
+                                            navigator.resetRoot(LoginScreen)
+                                        },
+                                    )
                                 }
                         } finally {
                             isLoading = false
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt
@@ -49,8 +49,8 @@ class LoginPresenter @AssistedInject constructor(
                     scope.launch {
                         try {
                             repository.login(event.accessToken)
-                                .onSuccess {
-                                    // TODO Token 저장
+                                .onSuccess { result ->
+                                    repository.saveTokens(result.accessToken, result.refreshToken)
                                     navigator.resetRoot(HomeScreen)
                                 }.onFailure { exception ->
                                     exception.message?.let { Logger.e(it) }
