fix(adapter-nextjs): Set-Cookie headers incorrectly set with getServe…

…rSideProps context
aws-amplify · May 15, 2024 · 1283b78 · 1283b78
1 parent 291e989
commit 1283b78
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/...es/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts b/...es/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts
@@ -293,7 +293,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 
 			const request = new IncomingMessage(new Socket());
 			const response = new ServerResponse(request);
-			const setHeaderSpy = jest.spyOn(response, 'setHeader');
+			const appendHeaderSpy = jest.spyOn(response, 'appendHeader');
 
 			Object.defineProperty(request, 'cookies', {
 				get() {
@@ -314,21 +314,30 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			]);
 
 			result.set('key3', 'value3');
-			expect(setHeaderSpy).toHaveBeenCalledWith('Set-Cookie', 'key3=value3;');
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
+				'Set-Cookie',
+				'key3=value3;',
+			);
 
 			result.set('key4', 'value4', {
 				httpOnly: true,
 			});
-			expect(setHeaderSpy).toHaveBeenCalledWith(
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
 				'key4=value4;HttpOnly',
 			);
 
 			result.delete('key3');
-			expect(setHeaderSpy).toHaveBeenCalledWith(
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
 				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
+
+			expect(response.getHeader('Set-Cookie')).toEqual([
+				'key3=value3;',
+				'key4=value4;HttpOnly',
+				'key3=;Expires=Thu, 01 Jan 1970 00:00:00 GMT',
+			]);
 		});
 
 		it('operates with the underlying cookie store with encoded cookie names', () => {
@@ -346,7 +355,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 
 			const request = new IncomingMessage(new Socket());
 			const response = new ServerResponse(request);
-			const setHeaderSpy = jest.spyOn(response, 'setHeader');
+			const appendHeaderSpy = jest.spyOn(response, 'appendHeader');
 
 			Object.defineProperty(request, 'cookies', {
 				get() {
@@ -371,7 +380,10 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			]);
 
 			result.set('key3', 'value3');
-			expect(setHeaderSpy).toHaveBeenCalledWith('Set-Cookie', 'key3=value3;');
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
+				'Set-Cookie',
+				'key3=value3;',
+			);
 
 			result.set('key4', 'value4', {
 				httpOnly: true,
@@ -381,16 +393,23 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 				'test@email.com.somethingElse',
 			);
 			result.set(encodeURIComponent('test@email.com.somethingElse'), 'value5');
-			expect(setHeaderSpy).toHaveBeenCalledWith(
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
 				`${encodeURIComponent(encodedCookieName)}=value5;`,
 			);
 
 			result.delete('key3');
-			expect(setHeaderSpy).toHaveBeenCalledWith(
+			expect(appendHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
 				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
+
+			expect(response.getHeader('Set-Cookie')).toEqual([
+				'key3=value3;',
+				'key4=value4;HttpOnly',
+				'test%2540email.com.somethingElse=value5;',
+				'key3=;Expires=Thu, 01 Jan 1970 00:00:00 GMT',
+			]);
 		});
 	});
 

diff --git a/packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts b/packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts
@@ -171,15 +171,15 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
 			return allCookies;
 		},
 		set(name, value, options) {
-			response.setHeader(
+			response.appendHeader(
 				'Set-Cookie',
 				`${ensureEncodedForJSCookie(name)}=${value};${
 					options ? serializeSetCookieOptions(options) : ''
 				}`,
 			);
 		},
 		delete(name) {
-			response.setHeader(
+			response.appendHeader(
 				'Set-Cookie',
 				`${ensureEncodedForJSCookie(
 					name,