cleanup

Author: rli

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt

@@ -19,7 +19,6 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
-import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAuthState
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
@@ -76,26 +75,18 @@ class DefaultAuthCredentialsService(
             {
                 try {
                     if (isQConnected(project)) {
-                        if (isQExpired(project)) {
-                            val manager = ToolkitConnectionManager.getInstance(project)
-                            val connection = manager.activeConnectionForFeature(QConnection.getInstance()) ?: return@scheduleWithFixedDelay
-
-                            // Try to refresh the token if it's in NEEDS_REFRESH state
-                            val tokenProvider = (connection.getConnectionSettings() as? TokenConnectionSettings)
-                                ?.tokenProvider
-                                ?.delegate
-                                ?.let { it as? BearerTokenProvider } ?: return@scheduleWithFixedDelay
-
-                            // periodically poll token to trigger a background refresh if needed
-                            try {
-                                tokenProvider.resolveToken()
-                            } catch (e: Exception) {
-                                LOG.warn(e) { "Failed to refresh bearer token" }
-                            }
-                        }
+                        val manager = ToolkitConnectionManager.getInstance(project)
+                        val connection = manager.activeConnectionForFeature(QConnection.getInstance()) ?: return@scheduleWithFixedDelay
+
+                        // periodically poll token to trigger a background refresh if needed
+                        val tokenProvider = (connection.getConnectionSettings() as? TokenConnectionSettings)
+                            ?.tokenProvider
+                            ?.delegate
+                            ?.let { it as? BearerTokenProvider } ?: return@scheduleWithFixedDelay
+                        tokenProvider.resolveToken()
                     }
                 } catch (e: Exception) {
-                    LOG.warn(e) { "Failed to sync bearer token to Flare" }
+                    LOG.warn(e) { "Failed to refresh bearer token" }
                 }
             },
             tokenRefreshInterval,

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderTest.kt

@@ -248,11 +248,13 @@ class InteractiveBearerTokenProviderTest {
         stubClientRegistration()
         stubAccessToken()
         val sut = buildSut()
+        whenever(diskCache.loadAccessToken(any<DeviceGrantAccessTokenCacheKey>())).thenReturn(null)
         sut.invalidate()
 
         // initial load
         // invalidate attempts to reload token from disk
         verify(diskCache, times(2)).loadAccessToken(any<DeviceGrantAccessTokenCacheKey>())
+        verify(diskCache).loadAccessToken(any<PKCEAccessTokenCacheKey>())
         verify(diskCache).invalidateClientRegistration(region)
         verify(diskCache).invalidateAccessToken(startUrl)
 
@@ -268,6 +270,10 @@ class InteractiveBearerTokenProviderTest {
 
         // nothing else
         verifyNoMoreInteractions(diskCache)
+
+        // should not have a token now
+        assertThat(sut.currentToken()?.accessToken).isNull()
+        assertThrows<NoTokenInitializedException> { sut.resolveToken() }
     }
 
     @Test