캐싱된 JWT 토큰 제거 시점 수정

Author: Ojongseok

core/data/src/main/java/com/neki/android/core/data/remote/di/NetworkModule.kt

@@ -2,7 +2,6 @@ package com.neki.android.core.data.remote.di
 
 import com.neki.android.core.common.const.Const.TAG_REST_API
 import com.neki.android.core.data.BuildConfig
-import com.neki.android.core.data.remote.api.AuthService
 import com.neki.android.core.data.remote.model.request.RefreshTokenRequest
 import com.neki.android.core.data.remote.model.response.AuthResponse
 import com.neki.android.core.data.remote.model.response.BasicResponse
@@ -18,7 +17,6 @@ import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.android.Android
 import io.ktor.client.plugins.DefaultRequest
-import io.ktor.client.plugins.plugin
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.auth.Auth
 import io.ktor.client.plugins.auth.providers.BearerAuthProvider
@@ -28,6 +26,7 @@ import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.plugin
 import io.ktor.client.request.header
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody

core/data/src/main/java/com/neki/android/core/data/repository/impl/TokenRepositoryImpl.kt

@@ -5,6 +5,7 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import com.neki.android.core.common.crypto.CryptoManager
 import com.neki.android.core.dataapi.datastore.DataStoreKey
+import com.neki.android.core.dataapi.auth.AuthCacheManager
 import com.neki.android.core.dataapi.repository.TokenRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -13,6 +14,7 @@ import javax.inject.Inject
 
 class TokenRepositoryImpl @Inject constructor(
     @TokenDataStore private val dataStore: DataStore<Preferences>,
+    private val authCacheManager: AuthCacheManager,
 ) : TokenRepository {
     override suspend fun saveTokens(
         accessToken: String,
@@ -22,6 +24,7 @@ class TokenRepositoryImpl @Inject constructor(
             preferences[DataStoreKey.ACCESS_TOKEN] = CryptoManager.encrypt(accessToken)
             preferences[DataStoreKey.REFRESH_TOKEN] = CryptoManager.encrypt(refreshToken)
         }
+        authCacheManager.invalidateTokenCache()
     }
 
     override fun isSavedTokens(): Flow<Boolean> {
@@ -50,5 +53,6 @@ class TokenRepositoryImpl @Inject constructor(
             preferences.remove(DataStoreKey.ACCESS_TOKEN)
             preferences.remove(DataStoreKey.REFRESH_TOKEN)
         }
+        authCacheManager.invalidateTokenCache()
     }
 }

core/domain/src/main/java/com/neki/android/core/domain/usecase/UploadMultiplePhotoUseCase.kt

@@ -11,7 +11,6 @@ import com.neki.android.core.model.MediaType
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
-import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
 

feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/LoginViewModel.kt

@@ -2,7 +2,6 @@ package com.neki.android.feature.auth.impl
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.neki.android.core.dataapi.auth.AuthCacheManager
 import com.neki.android.core.dataapi.auth.AuthEventManager
 import com.neki.android.core.dataapi.repository.AuthRepository
 import com.neki.android.core.dataapi.repository.TokenRepository
@@ -19,7 +18,6 @@ class LoginViewModel @Inject constructor(
     private val authEventManager: AuthEventManager,
     private val tokenRepository: TokenRepository,
     private val authRepository: AuthRepository,
-    private val authCacheManager: AuthCacheManager,
 ) : ViewModel() {
     val store: MviIntentStore<LoginState, LoginIntent, LoginSideEffect> =
         mviIntentStore(
@@ -48,7 +46,6 @@ class LoginViewModel @Inject constructor(
                 refreshToken = tokenRepository.getRefreshToken().first(),
             ).onSuccess {
                 tokenRepository.saveTokens(it.accessToken, it.refreshToken)
-                authCacheManager.invalidateTokenCache()
                 postSideEffect(LoginSideEffect.NavigateToHome)
             }.onFailure { exception ->
                 Timber.e(exception)
@@ -71,7 +68,6 @@ class LoginViewModel @Inject constructor(
                     accessToken = it.accessToken,
                     refreshToken = it.refreshToken,
                 )
-                authCacheManager.invalidateTokenCache()
                 postSideEffect(LoginSideEffect.NavigateToHome)
             }
             .onFailure { exception ->