From 6125e317c3d61c87eaa9ea4d05c2687ca117325f Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Tue, 6 Mar 2018 16:18:49 -0800 Subject: Changing json encoding of response Updating the json encoding to use Marshal This is to allow us to set the right return Header type and also return the right status codes Issue-ID: AAF-160 Change-Id: Ib260e5b8306b16069c57f6b83efcf401747ff2b6 Signed-off-by: Kiran Kamineni --- sms-service/src/sms/handler/handler.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sms-service/src/sms/handler/handler.go b/sms-service/src/sms/handler/handler.go index 496b782..4456806 100644 --- a/sms-service/src/sms/handler/handler.go +++ b/sms-service/src/sms/handler/handler.go @@ -50,14 +50,16 @@ func (h handler) createSecretDomainHandler(w http.ResponseWriter, r *http.Reques return } - err = json.NewEncoder(w).Encode(dom) + jdata, err := json.Marshal(dom) if err != nil { smslogger.WriteError(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) return } + w.Header().Set("Content-Type", "application/json") w.WriteHeader(http.StatusCreated) + w.Write(jdata) } // deleteSecretDomainHandler deletes a secret domain with the name provided @@ -113,12 +115,15 @@ func (h handler) getSecretHandler(w http.ResponseWriter, r *http.Request) { return } - err = json.NewEncoder(w).Encode(sec) + jdata, err := json.Marshal(sec) if err != nil { smslogger.WriteError(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) return } + + w.Header().Set("Content-Type", "application/json") + w.Write(jdata) } // listSecretHandler handles listing all secrets under a particular domain name @@ -133,12 +138,15 @@ func (h handler) listSecretHandler(w http.ResponseWriter, r *http.Request) { return } - err = json.NewEncoder(w).Encode(sec) + jdata, err := json.Marshal(sec) if err != nil { smslogger.WriteError(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) return } + + w.Header().Set("Content-Type", "application/json") + w.Write(jdata) } // deleteSecretHandler handles deleting a secret by given domain name and secret name @@ -170,12 +178,15 @@ func (h handler) statusHandler(w http.ResponseWriter, r *http.Request) { } status := backendStatus{Seal: s} - err = json.NewEncoder(w).Encode(status) + jdata, err := json.Marshal(status) if err != nil { smslogger.WriteError(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) return } + + w.Header().Set("Content-Type", "application/json") + w.Write(jdata) } // loginHandler handles login via password and username -- cgit