Cookies were incorrectly handled for v2.

Author: Arran Ubels

core/requestv2.go

@@ -164,6 +164,10 @@ func (r *RequestAccessorV2) EventToRequest(req events.APIGatewayV2HTTPRequest) (
 		return nil, err
 	}
 
+	for _, cookie := range req.Cookies {
+		httpRequest.Header.Add("Cookie", cookie)
+	}
+
 	for headerKey, headerValue := range req.Headers {
 		for _, val := range strings.Split(headerValue, ",") {
 			httpRequest.Header.Add(headerKey, strings.Trim(val, " "))

core/requestv2_test.go

@@ -320,6 +320,19 @@ var _ = Describe("RequestAccessorV2 tests", func() {
 			Expect(myCustomHost).To(Equal("http://" + httpReq.URL.Host))
 			os.Unsetenv(core.CustomHostVariable)
 		})
+
+		It("handles cookies okay", func() {
+			basicRequest := getProxyRequestV2("orders", "GET")
+			basicRequest.Cookies = []string{
+				"TestCookie=123",
+			}
+			accessor := core.RequestAccessorV2{}
+			httpReq, err := accessor.EventToRequestWithContext(context.Background(), basicRequest)
+			Expect(err).To(BeNil())
+			Expect(httpReq.Cookie("TestCookie")).To(gstruct.PointTo(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
+				"Value": Equal("123"),
+			})))
+		})
 	})
 })
 

core/responsev2.go

@@ -102,8 +102,13 @@ func (r *ProxyResponseWriterV2) GetProxyResponse() (events.APIGatewayV2HTTPRespo
 	}
 
 	headers := make(map[string]string)
+	cookies := make([]string, 0)
 
 	for headerKey, headerValue := range http.Header(r.headers) {
+		if strings.EqualFold("set-cookie", headerKey) {
+			cookies = append(cookies, headerValue...)
+			continue
+		}
 		headers[headerKey] = strings.Join(headerValue, ",")
 	}
 
@@ -112,5 +117,6 @@ func (r *ProxyResponseWriterV2) GetProxyResponse() (events.APIGatewayV2HTTPRespo
 		Headers:         headers,
 		Body:            output,
 		IsBase64Encoded: isBase64,
+		Cookies:         cookies,
 	}, nil
 }

core/responsev2_test.go

@@ -158,15 +158,27 @@ var _ = Describe("ResponseWriterV2 tests", func() {
 		})
 
 		It("Writes multi-value headers correctly", func() {
+			response := NewProxyResponseWriterV2()
+			response.Header().Add("Accepts", "foobar")
+			response.Header().Add("Accepts", "barfoo")
+			response.Write([]byte("hello"))
+			proxyResponse, err := response.GetProxyResponse()
+			Expect(err).To(BeNil())
+
+			Expect(2).To(Equal(len(proxyResponse.Headers)))
+			Expect("foobar,barfoo").To(Equal(proxyResponse.Headers["Accepts"]))
+		})
+
+		It("Writes cookies correctly", func() {
 			response := NewProxyResponseWriterV2()
 			response.Header().Add("Set-Cookie", "csrftoken=foobar")
 			response.Header().Add("Set-Cookie", "session_id=barfoo")
 			response.Write([]byte("hello"))
 			proxyResponse, err := response.GetProxyResponse()
 			Expect(err).To(BeNil())
 
-			Expect(2).To(Equal(len(proxyResponse.Headers)))
-			Expect("csrftoken=foobar,session_id=barfoo").To(Equal(proxyResponse.Headers["Set-Cookie"]))
+			Expect(2).To(Equal(len(proxyResponse.Cookies)))
+			Expect(strings.Split("csrftoken=foobar,session_id=barfoo", ",")).To(Equal(proxyResponse.Cookies))
 		})
 	})