Merge master into feature/web

Author: aws-toolkit-automation

src/auth/secondaryAuth.ts

@@ -157,13 +157,11 @@ export class SecondaryAuth<T extends Connection = Connection> {
     /**
      * Globally deletes the connection that this secondary auth is using,
      * effectively doing a signout.
-     *
-     * The deletion automatically propogates to the other users of this
-     * connection, assuming they've configured the event listeners.
      */
     public async deleteConnection() {
         if (this.activeConnection) {
             await this.auth.deleteConnection(this.activeConnection)
+            await this.clearSavedConnection()
         }
     }
 

src/codewhisperer/util/authUtil.ts

@@ -45,7 +45,6 @@ export const isValidCodeWhispererConnection = (conn?: Connection): conn is Conne
 export class AuthUtil {
     static #instance: AuthUtil
 
-    private usingEnterpriseSSO: boolean = false
     private reauthenticatePromptShown: boolean = false
     private _isCustomizationFeatureEnabled: boolean = false
 
@@ -79,14 +78,9 @@ export class AuthUtil {
             }
         })
 
-        this.secondaryAuth.onDidChangeActiveConnection(async conn => {
-            if (conn?.type === 'sso') {
-                this.usingEnterpriseSSO = !isBuilderIdConnection(conn)
-                if (!this.isConnectionExpired() && this.usingEnterpriseSSO) {
-                    vscode.commands.executeCommand('aws.codeWhisperer.notifyNewCustomizations')
-                }
-            } else {
-                this.usingEnterpriseSSO = false
+        this.secondaryAuth.onDidChangeActiveConnection(async () => {
+            if (this.isValidEnterpriseSsoInUse()) {
+                vscode.commands.executeCommand('aws.codeWhisperer.notifyNewCustomizations')
             }
             await Promise.all([
                 vscode.commands.executeCommand('aws.codeWhisperer.refresh'),
@@ -134,7 +128,10 @@ export class AuthUtil {
     }
 
     public isEnterpriseSsoInUse(): boolean {
-        return this.conn !== undefined && this.usingEnterpriseSSO
+        const conn = this.conn
+        // we have an sso that isn't builder id, must be IdC by process of elimination
+        const isUsingEnterpriseSso = conn?.type === 'sso' && !isBuilderIdConnection(conn)
+        return conn !== undefined && isUsingEnterpriseSso
     }
 
     // If there is an active SSO connection