Remove STS cache watcher

Author: liramon1

packages/core/src/auth/auth2.ts

@@ -57,7 +57,7 @@ import { LanguageClient } from 'vscode-languageclient'
 import { getLogger } from '../shared/logger/logger'
 import { ToolkitError } from '../shared/errors'
 import { useDeviceFlow } from './sso/ssoAccessTokenProvider'
-import { getCacheDir, getCacheFileWatcher, getFlareCacheFileName, getStsCacheDir } from './sso/cache'
+import { getCacheDir, getCacheFileWatcher, getFlareCacheFileName } from './sso/cache'
 import { VSCODE_EXTENSION_ID } from '../shared/extensions'
 import { IamCredentials } from '@aws/language-server-runtimes-types'
 import globals from '../shared/extensionGlobals'
@@ -89,8 +89,6 @@ export type LoginType = (typeof LoginTypes)[keyof typeof LoginTypes]
 
 export type cacheChangedEvent = 'delete' | 'create'
 
-export type stsCacheChangedEvent = 'delete' | 'create'
-
 export type Login = SsoLogin | IamLogin
 
 export type TokenSource = IamIdentityCenterSsoTokenSource | AwsBuilderIdSsoTokenSource
@@ -116,10 +114,6 @@ const IamProfileOptionsDefaults = {
  */
 export class LanguageClientAuth {
     readonly #ssoCacheWatcher = getCacheFileWatcher(getCacheDir(), getFlareCacheFileName(VSCODE_EXTENSION_ID.amazonq))
-    readonly #stsCacheWatcher = getCacheFileWatcher(
-        getStsCacheDir(),
-        getFlareCacheFileName(VSCODE_EXTENSION_ID.amazonq)
-    )
 
     constructor(
         private readonly client: LanguageClient,
@@ -131,10 +125,6 @@ export class LanguageClientAuth {
         return this.#ssoCacheWatcher
     }
 
-    public get stsCacheWatcher() {
-        return this.#stsCacheWatcher
-    }
-
     getSsoToken(
         tokenSource: TokenSource,
         login: boolean = false,
@@ -291,11 +281,6 @@ export class LanguageClientAuth {
         this.cacheWatcher.onDidCreate(() => cacheChangedHandler('create'))
         this.cacheWatcher.onDidDelete(() => cacheChangedHandler('delete'))
     }
-
-    registerStsCacheWatcher(stsCacheChangedHandler: (event: stsCacheChangedEvent) => any) {
-        this.stsCacheWatcher.onDidCreate(() => stsCacheChangedHandler('create'))
-        this.stsCacheWatcher.onDidDelete(() => stsCacheChangedHandler('delete'))
-    }
 }
 
 /**

packages/core/src/auth/sso/cache.ts

@@ -36,9 +36,7 @@ export interface SsoCache {
 }
 
 const defaultCacheDir = () => path.join(fs.getUserHomeDir(), '.aws/sso/cache')
-const defaultStsCacheDir = () => path.join(fs.getUserHomeDir(), '.aws/flare/cache')
 export const getCacheDir = () => DevSettings.instance.get('ssoCacheDirectory', defaultCacheDir())
-export const getStsCacheDir = () => DevSettings.instance.get('stsCacheDirectory', defaultStsCacheDir())
 
 export function getCache(directory = getCacheDir()): SsoCache {
     return {

packages/core/src/codewhisperer/util/authUtil.ts

@@ -33,7 +33,6 @@ import { telemetry } from '../../shared/telemetry/telemetry'
 import {
     AuthStateEvent,
     cacheChangedEvent,
-    stsCacheChangedEvent,
     LanguageClientAuth,
     Login,
     SsoLogin,
@@ -117,7 +116,6 @@ export class AuthUtil implements IAuthProvider {
             await this.setVscodeContextProps()
         })
         lspAuth.registerCacheWatcher(async (event: cacheChangedEvent) => await this.cacheChangedHandler(event))
-        lspAuth.registerStsCacheWatcher(async (event: stsCacheChangedEvent) => await this.stsCacheChangedHandler(event))
     }
 
     // Do NOT use this in production code, only used for testing
@@ -363,15 +361,6 @@ export class AuthUtil implements IAuthProvider {
         }
     }
 
-    private async stsCacheChangedHandler(event: stsCacheChangedEvent) {
-        this.logger.debug(`Sts Cache change event received: ${event}`)
-        if (event === 'delete') {
-            await this.logout()
-        } else if (event === 'create') {
-            await this.restore()
-        }
-    }
-
     private async stateChangeHandler(e: AuthStateEvent) {
         if (e.state === 'refreshed') {
             if (this.isSsoSession()) {

packages/core/src/test/testAuthUtil.ts

@@ -58,7 +58,6 @@ export async function createTestAuthUtil() {
         updateIamProfile: sinon.stub().resolves(),
         invalidateSsoToken: sinon.stub().resolves(),
         registerCacheWatcher: sinon.stub().resolves(),
-        registerStsCacheWatcher: sinon.stub().resolves(),
         encryptionKey,
     }