fix await

Author: adrianjoshua-strutt

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

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

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

@@ -80,14 +80,12 @@ export class DefaultIdentityIdStore implements IdentityIdStore {
 		} else {
 			this._primaryIdentityId = identity.id;
 			// Clear locally stored guest id
-			// On the server-side we use the _hasGuestIdentityId flag to avoid caching issues
-			const serverside = typeof window === 'undefined';
-			if (this._hasGuestIdentityId || !serverside) {
-				if (this.keyValueStorage.getItem(this._authKeys.identityId) !== null) {
+			this.keyValueStorage.getItem(this._authKeys.identityId).then(item => {
+				if (item) {
 					this.keyValueStorage.removeItem(this._authKeys.identityId);
 				}
-				this._hasGuestIdentityId = false;
-			}
+			});
+			this._hasGuestIdentityId = false;
 		}
 	}