fix: fix unit tests and add check if keyValueStore has guest token

Author: adrianjoshua-strutt

packages/auth/__tests__/providers/cognito/credentialsProvider/IdentityIdStore.test.ts

@@ -47,7 +47,7 @@ describe('DefaultIdentityIdStore', () => {
 
 	afterEach(() => {
 		mockKeyValueStorage.setItem.mockClear();
-		mockKeyValueStorage.getItem.mockClear();
+		mockKeyValueStorage.getItem.mockReset();
 		mockKeyValueStorage.removeItem.mockClear();
 		mockKeyValueStorage.clear.mockClear();
 	});
@@ -73,6 +73,7 @@ describe('DefaultIdentityIdStore', () => {
 	});
 
 	it('should store primary identityId in keyValueStorage', async () => {
+		mockKeyValueStorage.getItem.mockResolvedValue(validGuestIdentityId.id);
 		defaultIdStore.storeIdentityId(validPrimaryIdentityId);
 		expect(mockKeyValueStorage.removeItem).toHaveBeenCalledWith(
 			validAuthKey.identityId,
@@ -114,6 +115,7 @@ describe('DefaultIdentityIdStore', () => {
 	});
 
 	it('should not call keyValueStorage.removeItem when there is no guest identityId to clear', async () => {
+		mockKeyValueStorage.getItem.mockReturnValue(null);
 		const refreshIdentityIdStore = new DefaultIdentityIdStore(
 			mockKeyValueStorage,
 		);

packages/auth/src/providers/cognito/credentialsProvider/IdentityIdStore.ts

@@ -83,7 +83,9 @@ export class DefaultIdentityIdStore implements IdentityIdStore {
 			// On the server-side we use the _hasGuestIdentityId flag to avoid caching issues
 			const serverside = typeof window === 'undefined';
 			if (this._hasGuestIdentityId || !serverside) {
-				this.keyValueStorage.removeItem(this._authKeys.identityId);
+				if (this.keyValueStorage.getItem(this._authKeys.identityId) !== null) {
+					this.keyValueStorage.removeItem(this._authKeys.identityId);
+				}
 				this._hasGuestIdentityId = false;
 			}
 		}