From 71c6437bab0c73a46f396476d70c3715ff125cf6 Mon Sep 17 00:00:00 2001 From: Bethuel Mmbaga Date: Thu, 25 Apr 2024 22:20:24 +0300 Subject: [PATCH] add content type before writing header (#1887) --- management/server/http/setupkeys_handler.go | 2 +- management/server/http/util/util.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/management/server/http/setupkeys_handler.go b/management/server/http/setupkeys_handler.go index 4adf3fdd0..5faedea13 100644 --- a/management/server/http/setupkeys_handler.go +++ b/management/server/http/setupkeys_handler.go @@ -181,8 +181,8 @@ func (h *SetupKeysHandler) GetAllSetupKeys(w http.ResponseWriter, r *http.Reques } func writeSuccess(w http.ResponseWriter, key *server.SetupKey) { - w.WriteHeader(200) w.Header().Set("Content-Type", "application/json") + w.WriteHeader(200) err := json.NewEncoder(w).Encode(toResponseBody(key)) if err != nil { util.WriteError(err, w) diff --git a/management/server/http/util/util.go b/management/server/http/util/util.go index 2bb279c76..acaa2838c 100644 --- a/management/server/http/util/util.go +++ b/management/server/http/util/util.go @@ -20,8 +20,8 @@ type ErrorResponse struct { // WriteJSONObject simply writes object to the HTTP response in JSON format func WriteJSONObject(w http.ResponseWriter, obj interface{}) { - w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(http.StatusOK) err := json.NewEncoder(w).Encode(obj) if err != nil { WriteError(err, w) @@ -63,8 +63,8 @@ func (d *Duration) UnmarshalJSON(b []byte) error { // WriteErrorResponse prepares and writes an error response i nJSON func WriteErrorResponse(errMsg string, httpStatus int, w http.ResponseWriter) { - w.WriteHeader(httpStatus) w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(httpStatus) err := json.NewEncoder(w).Encode(&ErrorResponse{ Message: errMsg, Code: httpStatus,