always set content-type header before writing errors
This fixes a bug where if the ContextDecorator actually returns an error, the frontend complains that the spi backend didn't return json.
diff --git a/endpoints/server.go b/endpoints/server.go
index 59a69c6..f884022 100644
--- a/endpoints/server.go
+++ b/endpoints/server.go
@@ -104,6 +104,10 @@
// ServeHTTP is Server's implementation of http.Handler interface.
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ // Always respond with JSON, even when an error occurs.
+ // Note: API server doesn't expect an encoding in Content-Type header.
+ w.Header().Set("Content-Type", "application/json")
+
c := NewContext(r)
if s.ContextDecorator != nil {
ctx, err := s.ContextDecorator(c)
@@ -114,10 +118,6 @@
c = ctx
}
- // Always respond with JSON, even when an error occurs.
- // Note: API server doesn't expect an encoding in Content-Type header.
- w.Header().Set("Content-Type", "application/json")
-
if r.Method != "POST" {
err := fmt.Errorf("rpc: POST method required, got %q", r.Method)
writeError(w, err)
