diff --git a/client_helpers.go b/client_helpers.go index 96c2f1d..0f8c3e8 100644 --- a/client_helpers.go +++ b/client_helpers.go @@ -225,10 +225,10 @@ func applyCookies(r *http.Request, rawCookies []string) { return } - raw := strings.Join(rawCookies, "; ") - tmp := http.Request{Header: http.Header{}} - tmp.Header.Set("Cookie", raw) + for _, raw := range rawCookies { + tmp.Header.Add("Cookie", raw) + } for _, c := range tmp.Cookies() { r.AddCookie(c) diff --git a/client_unary_call.go b/client_unary_call.go index 3dbd6ee..2e79855 100644 --- a/client_unary_call.go +++ b/client_unary_call.go @@ -211,7 +211,7 @@ func (c *Client) parseRsp(ctx context.Context, hrsp *http.Response, rsp any, opt if opts.ResponseMetadata != nil { for k, v := range hrsp.Header { - opts.ResponseMetadata.Set(k, strings.Join(v, ",")) + opts.ResponseMetadata.Append(k, v...) } } diff --git a/client_unary_call_test.go b/client_unary_call_test.go index b9a5a2b..4549f75 100644 --- a/client_unary_call_test.go +++ b/client_unary_call_test.go @@ -1186,6 +1186,98 @@ func TestClient_Call_HeadersAndCookies(t *testing.T) { } } +func TestClient_Call_SetCookie(t *testing.T) { + type ( + request = pb.Test_Client_Call_Request + response = pb.Test_Client_Call_Response + ) + + serverMock := func() *httptest.Server { + return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // Validate request + require.Equal(t, "POST", r.Method) + require.Equal(t, "/user/products", r.URL.RequestURI()) + + require.Equal(t, "application/json", r.Header.Get("Content-Type")) + require.Equal(t, "Bearer token", r.Header.Get("Authorization")) + require.Equal(t, "My-Header-Value", r.Header.Get("My-Header")) + + buf, err := io.ReadAll(r.Body) + require.NoError(t, err) + defer r.Body.Close() + + c := jsoncodec.NewCodec() + + req := &request{} + err = c.Unmarshal(buf, req) + require.NoError(t, err) + require.True(t, proto.Equal(&request{UserId: "123", OrderId: 456}, req)) + + // Return response + cookieN1, err := http.ParseSetCookie("sessionid=abc123; Path=/; HttpOnly") + require.NoError(t, err) + http.SetCookie(w, cookieN1) + + cookieN2, err := http.ParseSetCookie("theme=dark; Path=/; Max-Age=3600") + require.NoError(t, err) + http.SetCookie(w, cookieN2) + + cookieN3, err := http.ParseSetCookie("lang=en-US; Path=/") + require.NoError(t, err) + http.SetCookie(w, cookieN3) + + w.Header().Set("Content-Type", "application/json") + w.Header().Set("My-Header", "My-Header-Value") + w.WriteHeader(http.StatusNoContent) + })) + } + + server := serverMock() + defer server.Close() + + httpClient := httpcli.NewClient( + client.Codec("application/json", jsoncodec.NewCodec()), + ) + + var ( + ctx = metadata.NewOutgoingContext( + context.Background(), + metadata.Pairs("Authorization", "Bearer token", "My-Header", "My-Header-Value"), + ) + req = &request{UserId: "123", OrderId: 456} + rsp = &response{} + + respMetadata = metadata.Metadata{} + ) + + opts := []client.CallOption{ + client.WithAddress(server.URL), + client.WithResponseMetadata(&respMetadata), + httpcli.Method(http.MethodPost), + httpcli.Path("/user/products"), + httpcli.Body("*"), + } + + expectedSetCookie := []string{"sessionid=abc123; Path=/; HttpOnly", "theme=dark; Path=/; Max-Age=3600", "lang=en-US; Path=/"} + + err := httpClient.Call( + ctx, + httpClient.NewRequest("test.service", "Test.Call", req), + rsp, + opts..., + ) + require.NoError(t, err) + require.Empty(t, rsp) + + require.Equal(t, "application/json", respMetadata.GetJoined("Content-Type")) + require.Equal(t, "My-Header-Value", respMetadata.GetJoined("My-Header")) + for i, raw := range respMetadata.Get("Set-Cookie") { + cookie, err := http.ParseSetCookie(raw) + require.NoError(t, err) + require.Equal(t, expectedSetCookie[i], cookie.String()) + } +} + func TestClient_Call_NoContent(t *testing.T) { type ( request = pb.Test_Client_Call_Request