Allow setting multiple values for a request header

mislav · mislav · commit 7ffbde3e12be · 2020-05-20T15:21:31.000+02:00
diff --git a/pkg/cmd/api/http.go b/pkg/cmd/api/http.go
@@ -43,15 +43,15 @@ func httpRequest(client *http.Client, method string, p string, params interface{
 		return nil, err
 	}
 
-	if bodyIsJSON {
-		req.Header.Set("Content-Type", "application/json; charset=utf-8")
-	}
 	for _, h := range headers {
 		idx := strings.IndexRune(h, ':')
 		if idx == -1 {
 			return nil, fmt.Errorf("header %q requires a value separated by ':'", h)
 		}
-		req.Header.Set(h[0:idx], strings.TrimSpace(h[idx+1:]))
+		req.Header.Add(h[0:idx], strings.TrimSpace(h[idx+1:]))
+	}
+	if bodyIsJSON && req.Header.Get("Content-Type") == "" {
+		req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	}
 
 	return client.Do(req)

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@ func httpRequest(client *http.Client, method string, p string, params interface{`
`43`	`43`	`return nil, err`
`44`	`44`	`}`
`45`	`45`
`46`		`- if bodyIsJSON {`
`47`		`- req.Header.Set("Content-Type", "application/json; charset=utf-8")`
`48`		`- }`
`49`	`46`	`for _, h := range headers {`
`50`	`47`	`idx := strings.IndexRune(h, ':')`
`51`	`48`	`if idx == -1 {`
`52`	`49`	`return nil, fmt.Errorf("header %q requires a value separated by ':'", h)`
`53`	`50`	`}`
`54`		`- req.Header.Set(h[0:idx], strings.TrimSpace(h[idx+1:]))`
	`51`	`+ req.Header.Add(h[0:idx], strings.TrimSpace(h[idx+1:]))`
	`52`	`+ }`
	`53`	`+ if bodyIsJSON && req.Header.Get("Content-Type") == "" {`
	`54`	`+ req.Header.Set("Content-Type", "application/json; charset=utf-8")`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`return client.Do(req)`