fix merging disconnect

Author: yuxianrz

packages/core/src/auth/auth2.ts

@@ -376,8 +376,13 @@ export abstract class BaseLogin {
      * Decrypts an encrypted string, removes its quotes, and returns the resulting string
      */
     protected async decrypt(encrypted: string): Promise<string> {
-        const decrypted = await jose.compactDecrypt(encrypted, this.lspAuth.encryptionKey)
-        return decrypted.plaintext.toString().replaceAll('"', '')
+        try {
+            const decrypted = await jose.compactDecrypt(encrypted, this.lspAuth.encryptionKey)
+            return decrypted.plaintext.toString().replaceAll('"', '')
+        } catch (e) {
+            getLogger().error(`Failed to decrypt: ${encrypted}`)
+            return encrypted
+        }
     }
 }
 
@@ -589,6 +594,14 @@ export class IamLogin extends BaseLogin {
      * Restore the connection state and connection details to memory, if they exist.
      */
     async restore() {
+        const sessionData = await this.getProfile()
+        const credentials = sessionData?.profile?.settings
+        if (credentials?.aws_access_key_id && credentials?.aws_secret_access_key) {
+            this._data = {
+                accessKey: credentials.aws_access_key_id,
+                secretKey: credentials.aws_secret_access_key,
+            }
+        }
         try {
             await this._getIamCredential(false)
         } catch (err) {

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

@@ -155,7 +155,7 @@ export class AuthUtil implements IAuthProvider {
                 await this.session.restore()
                 if (!this.isConnected()) {
                     // If both fail, reset the session
-                    await this.session?.logout()
+                    this.session = undefined
                 }
             }
         }

packages/core/src/login/webview/vue/backend.ts

@@ -187,7 +187,7 @@ export abstract class CommonAuthWebview extends VueWebview {
     abstract fetchConnections(): Promise<AwsConnection[] | undefined>
 
     async errorNotification(e: AuthError) {
-        showMessage('error', e.text)
+        await showMessage('error', e.text)
     }
 
     abstract quitLoginScreen(): Promise<void>

packages/core/src/test/testAuthUtil.ts

@@ -26,16 +26,27 @@ export async function createTestAuthUtil() {
         },
     }
 
+    const fakeCredential = {
+        credential: {
+            id: 'fake-id',
+            kinds: [],
+            credentials: {
+                accessKeyId: 'fake-access-key-id',
+                secretAccessKey: 'fake-secret-access-key',
+                sessionToken: 'fake-session-token',
+            },
+        },
+        updateCredentialsParams: {
+            data: 'fake-data',
+        },
+    }
+
     const mockLspAuth: Partial<LanguageClientAuth> = {
         registerSsoTokenChangedHandler: sinon.stub().resolves(),
         registerStsCredentialChangedHandler: sinon.stub().resolves(),
         updateSsoProfile: sinon.stub().resolves(),
         getSsoToken: sinon.stub().resolves(fakeToken),
-        getIamCredential: sinon.stub().resolves({
-            accessKeyId: 'fake-access-key-id',
-            secretAccessKey: 'fake-secret-access-key',
-            sessionToken: 'fake-session-token',
-        }),
+        getIamCredential: sinon.stub().resolves(fakeCredential),
         getProfile: sinon.stub().resolves({
             sso_registration_scopes: ['codewhisperer'],
         }),