[Fix/#148] 토큰 401 관리 및 투데이 시간 파싱

app/src/main/java/org/memento/data/datastore/TokenDataStore.kt

@@ -1,11 +1,18 @@
 package org.memento.data.datastore
 
+import kotlinx.coroutines.flow.Flow
+
 interface TokenDataStore {
     var accessToken: String
     var refreshToken: String
     var isNewUser: Boolean
     var userEmail: String
     var loginSuccess: Boolean
+    val loginSuccessFlow: Flow<Boolean>
+    var onboardingCompleted: Boolean
+    val onboardingCompletedFlow: Flow<Boolean>
+
+    fun clearSession()
 
-    fun clearInfo()
+    fun clearAllInfo()
 }

app/src/main/java/org/memento/data/datastore/TokenDataStoreImpl.kt

@@ -1,7 +1,10 @@
 package org.memento.data.datastore
 
 import android.content.SharedPreferences
-import androidx.datastore.preferences.core.edit
+import androidx.core.content.edit
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import javax.inject.Inject
 
 class TokenDataStoreImpl
@@ -15,7 +18,7 @@ class TokenDataStoreImpl
                 return token
             }
             set(value) {
-                sharedPreferences.edit().putString(ACCESS_TOKEN, value).apply()
+                sharedPreferences.edit { putString(ACCESS_TOKEN, value) }
             }
 
         override var refreshToken: String
@@ -24,7 +27,7 @@ class TokenDataStoreImpl
                 return refreshToken
             }
             set(value) {
-                sharedPreferences.edit().putString(REFRESH_TOKEN, value).apply()
+                sharedPreferences.edit { putString(REFRESH_TOKEN, value) }
             }
 
         override var isNewUser: Boolean
@@ -33,7 +36,7 @@ class TokenDataStoreImpl
                 return isNewUser
             }
             set(value) {
-                sharedPreferences.edit().putBoolean(IS_NEW_USER, value).apply()
+                sharedPreferences.edit { putBoolean(IS_NEW_USER, value) }
             }
 
         override var userEmail: String
@@ -42,24 +45,59 @@ class TokenDataStoreImpl
                 return userEmail
             }
             set(value) {
-                sharedPreferences.edit().putString(USER_EMAIL, value).apply()
+                sharedPreferences.edit { putString(USER_EMAIL, value) }
             }
 
         override var loginSuccess: Boolean
             get() = sharedPreferences.getBoolean(LOGIN_SUCCESS, false)
             set(value) {
-                sharedPreferences.edit().putBoolean(LOGIN_SUCCESS, value).apply()
+                sharedPreferences.edit { putBoolean(LOGIN_SUCCESS, value) }
             }
 
-        override fun clearInfo() {
-            sharedPreferences.edit().clear().apply()
+        override val loginSuccessFlow: Flow<Boolean> = getBooleanFlow(LOGIN_SUCCESS, false)
+
+        override var onboardingCompleted: Boolean
+            get() = sharedPreferences.getBoolean(ONBOARDING_COMPLETED, false)
+            set(value) {
+                sharedPreferences.edit { putBoolean(ONBOARDING_COMPLETED, value) }
+            }
+
+        override val onboardingCompletedFlow: Flow<Boolean> = getBooleanFlow(ONBOARDING_COMPLETED, false)
+
+        override fun clearSession() {
+            sharedPreferences.edit {
+                remove(ACCESS_TOKEN)
+                remove(REFRESH_TOKEN)
+                putBoolean(LOGIN_SUCCESS, false)
+            }
+        }
+
+        override fun clearAllInfo() {
+            sharedPreferences.edit { clear() }
         }
 
+        private fun getBooleanFlow(
+            key: String,
+            defaultValue: Boolean,
+        ): Flow<Boolean> =
+            callbackFlow {
+                val listener =
+                    SharedPreferences.OnSharedPreferenceChangeListener { _, changedKey ->
+                        if (changedKey == key || changedKey == null) {
+                            trySend(sharedPreferences.getBoolean(key, defaultValue))
+                        }
+                    }
+                sharedPreferences.registerOnSharedPreferenceChangeListener(listener)
+                trySend(sharedPreferences.getBoolean(key, defaultValue))
+                awaitClose { sharedPreferences.unregisterOnSharedPreferenceChangeListener(listener) }
+            }
+
         companion object {
             private const val ACCESS_TOKEN = "ACCESS_TOKEN"
             private const val REFRESH_TOKEN = "REFRESH_TOKEN"
             private const val IS_NEW_USER = "IS_NEW_USER"
             private const val USER_EMAIL = "USER_EMAIL"
             private const val LOGIN_SUCCESS = "LOGIN_SUCCESS"
+            private const val ONBOARDING_COMPLETED = "ONBOARDING_COMPLETED"
         }
     }

app/src/main/java/org/memento/data/util/Interceptor.kt

@@ -1,5 +1,6 @@
 package org.memento.data.util
 
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
@@ -8,16 +9,19 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okio.IOException
 import org.memento.BuildConfig
+import org.memento.core.event.EventBus
 import org.memento.data.datastore.TokenDataStore
 import org.memento.data.dto.BaseResponse
 import org.memento.data.dto.response.ResponseRefreshDto
+import org.memento.presentation.type.EventType
 import timber.log.Timber
 import javax.inject.Inject
 
 class Interceptor
     @Inject
     constructor(
         private val json: Json,
+        private val eventBus: EventBus,
         private val tokenDataStore: TokenDataStore,
     ) : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
@@ -27,66 +31,75 @@ class Interceptor
                 if (!tokenDataStore.isNewUser) {
                     originalRequest.newAuthBuilder()
                 } else {
-                    Timber.d("❌ No access token found.")
                     originalRequest
                 }
 
             val response = chain.proceed(authRequest)
 
-            when (response.code) {
-                TOKEN_EXPIRED_CODE -> {
-                    Timber.d("⏳ Token expired, trying to refresh token.")
+            if (response.code == TOKEN_EXPIRED_CODE) {
+                response.close()
 
-                    val refreshTokenRequest =
-                        originalRequest.newBuilder()
-                            .url("${BuildConfig.BASE_URL}api/v1/auth/token/refresh")
-                            .post("{}".toRequestBody("application/json".toMediaType()))
-                            .addHeader(AUTHORIZATION, "$BEARER ${tokenDataStore.refreshToken}")
-                            .build()
+                synchronized(this) {
+                    val isRefreshSuccessful = refreshToken(chain)
 
-                    response.close()
-
-                    val refreshTokenResponse = chain.proceed(refreshTokenRequest)
-
-                    val responseBodyString = refreshTokenResponse.peekBody(Long.MAX_VALUE).string()
-
-                    if (refreshTokenResponse.isSuccessful) {
-                        Timber.d("✅ Token refresh successful.")
+                    if (isRefreshSuccessful) {
+                        return chain.proceed(originalRequest.newAuthBuilder())
+                    }
+                }
+                throw IOException("Session expired. Please log in again.")
+            }
+            return response
+        }
 
-                        val responseRefresh = json.decodeFromString<BaseResponse<ResponseRefreshDto>>(responseBodyString)
+        private fun refreshToken(chain: Interceptor.Chain): Boolean {
+            Timber.d("⏳ Token expired, trying to refresh token.")
 
-                        responseRefresh.data?.let {
-                            with(tokenDataStore) {
-                                accessToken = responseRefresh.data.accessToken
-                                refreshToken = responseRefresh.data.refreshToken
-                            }
-                        }
+            val currentRefreshToken = tokenDataStore.refreshToken
+            if (currentRefreshToken.isBlank()) {
+                handleSessionExpired()
+                return false
+            }
 
-                        Timber.d("🎉 Updated accessToken")
+            val refreshTokenRequest =
+                chain.request().newBuilder()
+                    .url("${BuildConfig.BASE_URL}api/v1/auth/token/refresh")
+                    .post("{}".toRequestBody("application/json".toMediaType()))
+                    .addHeader(AUTHORIZATION, "$BEARER ${tokenDataStore.refreshToken}")
+                    .build()
 
-                        refreshTokenResponse.close()
+            val refreshTokenResponse = chain.proceed(refreshTokenRequest)
 
-                        val newRequest = originalRequest.newAuthBuilder()
-                        Timber.d("🚀 Sending new request with updated access token.")
+            if (refreshTokenResponse.isSuccessful) {
+                Timber.d("✅ Token refresh successful.")
+                val responseBodyString = refreshTokenResponse.peekBody(Long.MAX_VALUE).string()
+                val responseRefresh = json.decodeFromString<BaseResponse<ResponseRefreshDto>>(responseBodyString)
 
-                        return chain.proceed(newRequest)
-                    } else {
-                        Timber.d("❌ Failed to refresh token, response: ${refreshTokenResponse.code}")
-                        Timber.d("❌ Error body: $responseBodyString")
-                        refreshTokenResponse.close()
-                        throw IOException("Failed to refresh token")
+                responseRefresh.data?.let {
+                    with(tokenDataStore) {
+                        accessToken = responseRefresh.data.accessToken
+                        refreshToken = responseRefresh.data.refreshToken
                     }
                 }
+                Timber.d("🎉 Updated accessToken")
+
+                refreshTokenResponse.close()
+                return true
+            } else {
+                Timber.d("❌ Failed to refresh token, response: ${refreshTokenResponse.code}")
+                refreshTokenResponse.close()
+                handleSessionExpired()
+                return false
             }
-            return response
         }
 
-        private fun Request.newAuthBuilder() = this.newBuilder().addHeader(AUTHORIZATION, "$BEARER ${tokenDataStore.accessToken}").build()
-
-        private fun clearUserInfo() {
-            tokenDataStore.clearInfo()
+        private fun handleSessionExpired() {
+            runBlocking {
+                eventBus.emit(EventType.TokenExpired)
+            }
         }
 
+        private fun Request.newAuthBuilder() = this.newBuilder().addHeader(AUTHORIZATION, "$BEARER ${tokenDataStore.accessToken}").build()
+
         companion object {
             private const val TOKEN_EXPIRED_CODE = 401
             private const val BEARER = "Bearer"

app/src/main/java/org/memento/di/NetworkModule.kt

@@ -10,6 +10,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.memento.BuildConfig
+import org.memento.core.event.EventBus
 import org.memento.data.datastore.TokenDataStore
 import org.memento.data.util.Interceptor
 import retrofit2.Retrofit
@@ -36,9 +37,10 @@ object NetworkModule {
     @Singleton
     fun provideInterceptor(
         json: Json,
+        eventBus: EventBus,
         tokenDataStore: TokenDataStore,
     ): Interceptor {
-        return Interceptor(json, tokenDataStore)
+        return Interceptor(json, eventBus, tokenDataStore)
     }
 
     @Singleton