fix: fix aws api gateway v2 event source cookies handling (#389)

colonist4 · web-flow · commit 6e0868cb7665 · 2021-05-12T05:35:40.000+10:00
diff --git a/jest-helpers/api-gateway-v2-event.js b/jest-helpers/api-gateway-v2-event.js
@@ -102,6 +102,7 @@ function makeApiGatewayV2Response (values = {}, {
   }
   values.headers = convertMultiValueHeadersToHeaders({ multiValueHeaders: values.multiValueHeaders })
   delete values.multiValueHeaders
+  delete values.headers['set-cookie']
 
   if (shouldConvertContentLengthToInt) {
     // APIGWV2 returns content-length as a number instead of a string under certain conditions:
diff --git a/src/event-sources/aws/api-gateway-v2.js b/src/event-sources/aws/api-gateway-v2.js
@@ -62,8 +62,10 @@ function getResponseToApiGateway ({
     isBase64Encoded
   }
 
-  if (headers['set-cookie']) {
-    responseToApiGateway.cookies = headers['set-cookie']
+  const cookies = headers['set-cookie']
+  if (cookies) {
+    responseToApiGateway.cookies = Array.isArray(cookies) ? cookies : [cookies]
+    delete headers['set-cookie']
   }
 
   responseToApiGateway.headers = getCommaDelimitedHeaders({ headersMap: headers })

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ function makeApiGatewayV2Response (values = {}, {`
`102`	`102`	`}`
`103`	`103`	`values.headers = convertMultiValueHeadersToHeaders({ multiValueHeaders: values.multiValueHeaders })`
`104`	`104`	`delete values.multiValueHeaders`
	`105`	`+ delete values.headers['set-cookie']`
`105`	`106`
`106`	`107`	`if (shouldConvertContentLengthToInt) {`
`107`	`108`	`// APIGWV2 returns content-length as a number instead of a string under certain conditions:`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ function getResponseToApiGateway ({`
`62`	`62`	`isBase64Encoded`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (headers['set-cookie']) {`
`66`		`- responseToApiGateway.cookies = headers['set-cookie']`
	`65`	`+ const cookies = headers['set-cookie']`
	`66`	`+ if (cookies) {`
	`67`	`+ responseToApiGateway.cookies = Array.isArray(cookies) ? cookies : [cookies]`
	`68`	`+ delete headers['set-cookie']`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`responseToApiGateway.headers = getCommaDelimitedHeaders({ headersMap: headers })`