fix: recreate event buffer in pinpoint if the credentials has changed (#14403)

* fix: recreate event buffer in pinpoint if the credentials has changed

* fix: update the size limit for the analytics package

* chore: address code styling comments

---------

Co-authored-by: Aaron S. <94858815+stocaaro@users.noreply.github.com>

Author: sarayev

packages/aws-amplify/package.json

@@ -307,7 +307,7 @@
 			"name": "[Analytics] record (Pinpoint)",
 			"path": "./dist/esm/analytics/index.mjs",
 			"import": "{ record }",
-			"limit": "17.90 kB"
+			"limit": "17.92 kB"
 		},
 		{
 			"name": "[Analytics] record (Kinesis)",

packages/core/__tests__/providers/pinpoint/utils/EventBuffer.test.ts

@@ -55,4 +55,15 @@ describe('EventBuffer', () => {
 		buffer.push(EVENT_OBJECT);
 		buffer.push(EVENT_OBJECT);
 	});
+
+	test('haveCredentialsChanged returns true if credentials have changed', () => {
+		const config = { ...DEFAULT_CONFIG, bufferSize: 1 };
+		const buffer = new PinpointEventBuffer(config);
+		expect(
+			buffer.haveCredentialsChanged({
+				accessKeyId: 'different-access-key-id',
+				secretAccessKey: 'different-secret-access-key',
+			}),
+		).toBeTruthy();
+	});
 });

packages/core/__tests__/providers/pinpoint/utils/getEventBuffer.test.ts

@@ -22,6 +22,7 @@ const mockConfig = {
 describe('Pinpoint Provider Util: bufferManager', () => {
 	const mockPinpointEventBuffer = PinpointEventBuffer as jest.Mock;
 	const mockIdentityHasChanged = jest.fn();
+	const mockHaveCredentialsChanged = jest.fn();
 	const mockFlush = jest.fn();
 
 	beforeEach(() => {
@@ -30,6 +31,7 @@ describe('Pinpoint Provider Util: bufferManager', () => {
 		mockPinpointEventBuffer.mockReset();
 		mockPinpointEventBuffer.mockImplementation(() => ({
 			identityHasChanged: mockIdentityHasChanged,
+			haveCredentialsChanged: mockHaveCredentialsChanged,
 			flush: mockFlush,
 		}));
 	});
@@ -58,4 +60,16 @@ describe('Pinpoint Provider Util: bufferManager', () => {
 		expect(mockFlush).toHaveBeenCalledTimes(1);
 		expect(testBuffer).not.toBe(testBuffer2);
 	});
+
+	it('flushes & creates a new buffer when the credentials changes', () => {
+		const testBuffer = getEventBuffer(mockConfig);
+
+		mockIdentityHasChanged.mockReturnValue(false);
+		mockHaveCredentialsChanged.mockReturnValue(true);
+
+		const testBuffer2 = getEventBuffer(mockConfig);
+
+		expect(mockFlush).toHaveBeenCalledTimes(1);
+		expect(testBuffer).not.toBe(testBuffer2);
+	});
 });

packages/core/src/providers/pinpoint/utils/PinpointEventBuffer.ts

@@ -14,7 +14,8 @@ import {
 	EventBuffer,
 	PinpointEventBufferConfig,
 } from '../types/buffer';
-import { AuthSession } from '../../../singleton/Auth/types';
+import { AWSCredentials, AuthSession } from '../../../singleton/Auth/types';
+import { haveCredentialsChanged } from '../../../utils/haveCredentialsChanged';
 
 import { isAppInForeground } from './isAppInForeground';
 
@@ -66,6 +67,10 @@ export class PinpointEventBuffer {
 		return this._config.identityId !== identityId;
 	}
 
+	public haveCredentialsChanged(credentials: AWSCredentials) {
+		return haveCredentialsChanged(this._config.credentials, credentials);
+	}
+
 	public flushAll() {
 		this._putEvents(this._buffer.splice(0, this._buffer.length));
 	}

packages/core/src/providers/pinpoint/utils/getEventBuffer.ts

@@ -37,10 +37,14 @@ export const getEventBuffer = ({
 		const buffer = eventBufferMap[region][appId];
 
 		/*
-		If the identity has changed flush out the buffer and create a new instance. The old instance will be garbage
+		If the identity or credentials has changed flush out the buffer and create a new instance. The old instance will be garbage
 		collected.
 		*/
-		if (buffer.identityHasChanged(identityId)) {
+		const shouldFlushBuffer =
+			buffer.identityHasChanged(identityId) ||
+			buffer.haveCredentialsChanged(credentials);
+
+		if (shouldFlushBuffer) {
 			buffer.flush();
 		} else {
 			return buffer;