Delete cookie without path attr before setting it

aws-amplify · Jul 11, 2024 · 710327d · 710327d
1 parent 743c79e
commit 710327d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...ests__/adapterCore/storageFactories/createKeyValueStorageFromCookieStorageAdapter.test.ts b/...ests__/adapterCore/storageFactories/createKeyValueStorageFromCookieStorageAdapter.test.ts
@@ -40,6 +40,21 @@ describe('keyValueStorage', () => {
 				);
 			});
 
+			it('should remove item before setting item', async () => {
+				const testKey = 'testKey';
+				const testValue = 'testValue';
+				keyValueStorage.setItem(testKey, testValue);
+				expect(mockCookiesStorageAdapter.delete).toHaveBeenCalledWith(testKey);
+				expect(mockCookiesStorageAdapter.set).toHaveBeenCalledWith(
+					testKey,
+					testValue,
+					{
+						...defaultSetCookieOptions,
+						expires: expect.any(Date),
+					},
+				);
+			});
+
 			it('should set item with options', async () => {
 				const testKey = 'testKey';
 				const testValue = 'testValue';

diff --git a/...mplify/src/adapter-core/storageFactories/createKeyValueStorageFromCookieStorageAdapter.ts b/...mplify/src/adapter-core/storageFactories/createKeyValueStorageFromCookieStorageAdapter.ts
@@ -27,6 +27,11 @@ export const createKeyValueStorageFromCookieStorageAdapter = (
 ): KeyValueStorageInterface => {
 	return {
 		setItem(key, value) {
+			// Delete the cookie item first then set it. This results:
+			// SetCookie: key=;expires=1970-01-01;(path='current-path') <- remove path'ed cookies
+			// SetCookie: key=value;expires=Date.now() + 365 days;path=/;secure=true
+			cookieStorageAdapter.delete(key);
+
 			// TODO(HuiSF): follow up the default CookieSerializeOptions values
 			cookieStorageAdapter.set(key, value, {
 				...defaultSetCookieOptions,