Merge pull request #141 from pknu-wap/#139/refactor/tgyuu/changeNickn…

…ame,withdrawaleEhancement #139 refact removeTokens() 로직 보완
pknu-wap · Jun 7, 2023 · ea878c5 · ea878c5
2 parents a2ce2aa + 7b6fca4
commit ea878c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/datastore/src/main/java/com/android/mediproject/core/datastore/TokenDataSourceImpl.kt b/core/datastore/src/main/java/com/android/mediproject/core/datastore/TokenDataSourceImpl.kt
@@ -150,6 +150,7 @@ class TokenDataSourceImpl @Inject constructor(
         tokenDataStore.updateData {
             it.toBuilder().clear().build()
         }
+        updateTokenState()
     }
 
     private fun updateTokenState() {

diff --git a/core/datastore/src/main/java/com/android/mediproject/core/datastore/TokenServer.kt b/core/datastore/src/main/java/com/android/mediproject/core/datastore/TokenServer.kt
@@ -1,5 +1,6 @@
 package com.android.mediproject.core.datastore
 
+import android.util.Log
 import com.android.mediproject.core.model.remote.token.NewTokensFromAws
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -19,7 +20,8 @@ class TokenServerImpl @Inject constructor() : TokenServer {
      */
     override val currentTokens: EndpointTokenState
         get() {
-            val token = tokens.replayCache.firstOrNull()
+            val token = tokens.replayCache.lastOrNull()
+            Log.d("wap","TokenServer currentTokens () : token값 : "+token.toString())
             return if (token == null) {
                 EndpointTokenState.NoToken
             } else {