From c5ba6d949d6f83a9e26ab6c132449ab5023f552b Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Fri, 30 Sep 2016 21:51:26 -0700 Subject: Use json.NewDecoder to decode json from http --- cmd/cashierd/handlers_test.go | 6 +----- cmd/cashierd/main.go | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'cmd') diff --git a/cmd/cashierd/handlers_test.go b/cmd/cashierd/handlers_test.go index 38251ce..a6bd113 100644 --- a/cmd/cashierd/handlers_test.go +++ b/cmd/cashierd/handlers_test.go @@ -114,12 +114,8 @@ func TestSignRevoke(t *testing.T) { if resp.Code != http.StatusOK { t.Error("Unexpected response") } - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - t.Error(err) - } r := &lib.SignResponse{} - if err := json.Unmarshal(b, r); err != nil { + if err := json.NewDecoder(resp.Body).Decode(r); err != nil { t.Error(err) } if r.Status != "ok" { diff --git a/cmd/cashierd/main.go b/cmd/cashierd/main.go index 6e52ddf..88f190e 100644 --- a/cmd/cashierd/main.go +++ b/cmd/cashierd/main.go @@ -10,7 +10,6 @@ import ( "fmt" "html/template" "io" - "io/ioutil" "log" "net" "net/http" @@ -125,11 +124,7 @@ func (a *appContext) login(w http.ResponseWriter, r *http.Request) (int, error) // parseKey retrieves and unmarshals the signing request. func parseKey(r *http.Request) (*lib.SignRequest, error) { var s lib.SignRequest - body, err := ioutil.ReadAll(r.Body) - if err != nil { - return nil, err - } - if err := json.Unmarshal(body, &s); err != nil { + if err := json.NewDecoder(r.Body).Decode(&s); err != nil { return nil, err } return &s, nil -- cgit v1.2.3