Skip to content

fix(api): flagsmith api doesn't send a default content type #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khvn26 merged 1 commit into from
Aug 11, 2026
+23 −15
Merged

fix(api): flagsmith api doesn't send a default content type #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions internal/cmd/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func runAPI(cmd *cobra.Command, args []string) error {
return err
}

body, contentType, query, method, err := apiRequestBody(cmd)
body, query, method, err := apiRequestBody(cmd)
if err != nil {
return err
}
Expand All @@ -78,7 +78,7 @@ func runAPI(cmd *cobra.Command, args []string) error {
full += sep + query.Encode()
}

resp, respBody, err := apiDo(cmd.Context(), method, full, body, contentType, headers, applyAuth)
resp, respBody, err := apiDo(cmd.Context(), method, full, body, headers, applyAuth)
if err != nil {
return err
}
Expand Down Expand Up @@ -113,11 +113,11 @@ func apiTarget(cmd *cobra.Command, pc *projectContext) (string, func(*http.Reque

// apiRequestBody builds the request body (or query params) and resolves the
// method: explicit --method, else POST when a body/field is present, else GET.
func apiRequestBody(cmd *cobra.Command) (body []byte, contentType string, query url.Values, method string, err error) {
func apiRequestBody(cmd *cobra.Command) (body []byte, query url.Values, method string, err error) {
hasFields := len(apiFieldFlags)+len(apiRawFields) > 0
hasInput := cmd.Flags().Changed("input")
if hasFields && hasInput {
return nil, "", nil, "", usageErrorf("--input cannot be combined with -F/-f")
return nil, nil, "", usageErrorf("--input cannot be combined with -F/-f")
}

method = http.MethodGet
Expand All @@ -132,12 +132,12 @@ func apiRequestBody(cmd *cobra.Command) (body []byte, contentType string, query
case hasInput:
body, err = readInput(cmd, apiInputFlag)
if err != nil {
return nil, "", nil, "", err
return nil, nil, "", err
}
case hasFields && method == http.MethodGet:
fields, ferr := parseFields()
if ferr != nil {
return nil, "", nil, "", ferr
return nil, nil, "", ferr
}
query = url.Values{}
for k, v := range fields {
Expand All @@ -146,15 +146,14 @@ func apiRequestBody(cmd *cobra.Command) (body []byte, contentType string, query
case hasFields:
fields, ferr := parseFields()
if ferr != nil {
return nil, "", nil, "", ferr
return nil, nil, "", ferr
}
body, err = json.Marshal(fields)
if err != nil {
return nil, "", nil, "", err
return nil, nil, "", err
}
contentType = "application/json"
}
return body, contentType, query, method, nil
return body, query, method, nil
}

// parseFields merges typed (-F) and raw (-f) fields into one object.
Expand Down Expand Up @@ -217,7 +216,7 @@ func readInput(cmd *cobra.Command, path string) ([]byte, error) {
}

// apiDo issues one request and reads the full response body.
func apiDo(ctx context.Context, method, u string, body []byte, contentType string, headers http.Header, applyAuth func(*http.Request)) (*http.Response, []byte, error) {
func apiDo(ctx context.Context, method, u string, body []byte, headers http.Header, applyAuth func(*http.Request)) (*http.Response, []byte, error) {
var r io.Reader
if body != nil {
r = bytes.NewReader(body)
Expand All @@ -226,8 +225,9 @@ func apiDo(ctx context.Context, method, u string, body []byte, contentType strin
if err != nil {
return nil, nil, err
}
if contentType != "" {
req.Header.Set("Content-Type", contentType)
// The API speaks JSON, including for a body read verbatim from --input.
if body != nil && headers.Get("Content-Type") == "" {
req.Header.Set("Content-Type", "application/json")
}
for name, values := range headers {
for _, v := range values {
Expand Down
12 changes: 10 additions & 2 deletions internal/cmd/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7218,8 +7218,16 @@ func TestAPI(t *testing.T) {
t.Run("raw body from stdin", func(t *testing.T) {
flagUpdateEnv(t)
e := echoJSON(t, `{"x":1}`, "-X", "POST", "--input", "-")
if e["body"] != `{"x":1}` {
t.Errorf("body = %q", e["body"])
if e["body"] != `{"x":1}` || e["content_type"] != "application/json" {
t.Errorf("echo = %+v, want the raw body sent as JSON", e)
}
})

t.Run("-H overrides the default content type", func(t *testing.T) {
flagUpdateEnv(t)
e := echoJSON(t, "x=1", "-X", "POST", "--input", "-", "-H", "Content-Type: application/x-www-form-urlencoded")
if e["content_type"] != "application/x-www-form-urlencoded" {
t.Errorf("content_type = %q, want the -H value", e["content_type"])
}
})

Expand Down