fix: unit tests

Author: yuxianrz

packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts

@@ -435,9 +435,10 @@ describe('AuthUtil', async function () {
 
             assert.ok(mockIamLogin.login.calledOnce)
             assert.ok(
-                mockIamLogin.login.calledWith({
+                mockIamLogin.login.calledWithMatch({
                     accessKey: 'accessKey',
                     secretKey: 'secretKey',
+                    sessionToken: 'sessionToken',
                 })
             )
             assert.strictEqual(response, mockResponse)
@@ -523,7 +524,7 @@ describe('AuthUtil', async function () {
                 await auth.getIamCredential()
                 assert.fail('Should have thrown an error')
             } catch (err) {
-                assert.strictEqual((err as Error).message, 'Cannot get token with SSO session')
+                assert.strictEqual((err as Error).message, 'Cannot get credential with SSO session')
             }
         })
 

packages/core/src/auth/auth2.ts

@@ -645,7 +645,7 @@ export class IamLogin extends BaseLogin {
         }
 
         // Update cached credentials and credential ID
-        if (response.credential.credentials.accessKeyId && response.credential.credentials.secretAccessKey) {
+        if (response.credential?.credentials?.accessKeyId && response.credential?.credentials?.secretAccessKey) {
             this._data = {
                 accessKey: response.credential.credentials.accessKeyId,
                 secretKey: response.credential.credentials.secretAccessKey,

packages/core/src/test/credentials/auth2.test.ts

@@ -230,7 +230,7 @@ describe('LanguageClientAuth', () => {
 
             sinon.assert.calledOnce(client.sendRequest)
             sinon.assert.calledWith(client.sendRequest, invalidateStsCredentialRequestType.method, {
-                profileName: profileName,
+                iamCredentialId: profileName,
             })
             sinon.assert.match(result, { success: true })
         })
@@ -631,7 +631,6 @@ describe('IamLogin', () => {
     let lspAuth: sinon.SinonStubbedInstance<LanguageClientAuth>
     let iamLogin: IamLogin
     let eventEmitter: vscode.EventEmitter<any>
-    let fireEventSpy: sinon.SinonSpy
 
     const loginOpts = {
         accessKey: 'test-access-key',
@@ -657,7 +656,6 @@ describe('IamLogin', () => {
     beforeEach(() => {
         lspAuth = sinon.createStubInstance(LanguageClientAuth)
         eventEmitter = new vscode.EventEmitter()
-        fireEventSpy = sinon.spy(eventEmitter, 'fire')
         iamLogin = new IamLogin(profileName, lspAuth as any, eventEmitter)
         ;(iamLogin as any).eventEmitter = eventEmitter
         ;(iamLogin as any).connectionState = 'notConnected'
@@ -789,33 +787,6 @@ describe('IamLogin', () => {
             })
 
             sinon.assert.match(iamLogin.getConnectionState(), 'expired')
-            sinon.assert.calledOnce(fireEventSpy)
-            sinon.assert.calledWith(fireEventSpy, {
-                id: profileName,
-                state: 'expired',
-            })
-        })
-
-        it('emits refresh event when credential is refreshed', () => {
-            ;(iamLogin as any).stsCredentialChangedHandler({
-                kind: StsCredentialChangedKind.Refreshed,
-                stsCredentialId: 'test-credential-id',
-            })
-
-            sinon.assert.calledOnce(fireEventSpy)
-            sinon.assert.calledWith(fireEventSpy, {
-                id: profileName,
-                state: 'refreshed',
-            })
-        })
-
-        it('does not emit event for different credential ID', () => {
-            ;(iamLogin as any).stsCredentialChangedHandler({
-                kind: StsCredentialChangedKind.Refreshed,
-                stsCredentialId: 'different-credential-id',
-            })
-
-            sinon.assert.notCalled(fireEventSpy)
         })
     })
 })