Skip to content

fix: always remove guestIdentityId from keyValueStorage on client-side #14437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+11 −6
Open

fix: always remove guestIdentityId from keyValueStorage on client-side #14437

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d9d94e
fix: always remove guestIdentityId from keyValueStorage on client-side
adrianjoshua-strutt Jun 19, 2025
0133d83
fix: fix unit tests and add check if keyValueStore has guest token
adrianjoshua-strutt Jun 19, 2025
baf70be
fix await
adrianjoshua-strutt Jun 20, 2025
e22d3a8
add isBrowser again
adrianjoshua-strutt Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/auth/__tests__/providers/cognito/credentialsProvider/IdentityIdStore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('DefaultIdentityIdStore', () => {

afterEach(() => {
mockKeyValueStorage.setItem.mockClear();
mockKeyValueStorage.getItem.mockClear();
mockKeyValueStorage.getItem.mockReset();
mockKeyValueStorage.removeItem.mockClear();
mockKeyValueStorage.clear.mockClear();
});
Expand All @@ -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,
Expand Down Expand Up @@ -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,
);
Expand Down
8 changes: 6 additions & 2 deletions packages/auth/src/providers/cognito/credentialsProvider/IdentityIdStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,12 @@ export class DefaultIdentityIdStore implements IdentityIdStore {
} else {
this._primaryIdentityId = identity.id;
// Clear locally stored guest id
if (this._hasGuestIdentityId) {
this.keyValueStorage.removeItem(this._authKeys.identityId);
// 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.removeItem(this._authKeys.identityId);
}
this._hasGuestIdentityId = false;
}
}
Expand Down
Loading