From 3f473e4a0910d95bc5adb57d367f6f3a060de08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@miniflux.net>
Date: Fri, 22 Dec 2017 20:17:48 -0800
Subject: [PATCH] Improve response methods

---
 server/core/html_response.go |  8 ++++----
 server/core/json_response.go | 16 ++++++++--------
 server/core/response.go      |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/server/core/html_response.go b/server/core/html_response.go
index be75c311..a1941631 100644
--- a/server/core/html_response.go
+++ b/server/core/html_response.go
@@ -26,8 +26,8 @@ func (h *HTMLResponse) Render(template string, args map[string]interface{}) {
 
 // ServerError sends a 500 error to the browser.
 func (h *HTMLResponse) ServerError(err error) {
-	h.writer.WriteHeader(http.StatusInternalServerError)
 	h.writer.Header().Set("Content-Type", "text/html; charset=utf-8")
+	h.writer.WriteHeader(http.StatusInternalServerError)
 
 	if err != nil {
 		logger.Error("[Internal Server Error] %v", err)
@@ -39,8 +39,8 @@ func (h *HTMLResponse) ServerError(err error) {
 
 // BadRequest sends a 400 error to the browser.
 func (h *HTMLResponse) BadRequest(err error) {
-	h.writer.WriteHeader(http.StatusBadRequest)
 	h.writer.Header().Set("Content-Type", "text/html; charset=utf-8")
+	h.writer.WriteHeader(http.StatusBadRequest)
 
 	if err != nil {
 		logger.Error("[Bad Request] %v", err)
@@ -52,14 +52,14 @@ func (h *HTMLResponse) BadRequest(err error) {
 
 // NotFound sends a 404 error to the browser.
 func (h *HTMLResponse) NotFound() {
-	h.writer.WriteHeader(http.StatusNotFound)
 	h.writer.Header().Set("Content-Type", "text/html; charset=utf-8")
+	h.writer.WriteHeader(http.StatusNotFound)
 	h.writer.Write([]byte("Page Not Found"))
 }
 
 // Forbidden sends a 403 error to the browser.
 func (h *HTMLResponse) Forbidden() {
-	h.writer.WriteHeader(http.StatusForbidden)
 	h.writer.Header().Set("Content-Type", "text/html; charset=utf-8")
+	h.writer.WriteHeader(http.StatusForbidden)
 	h.writer.Write([]byte("Access Forbidden"))
 }
diff --git a/server/core/json_response.go b/server/core/json_response.go
index f493454f..8ee0b7f1 100644
--- a/server/core/json_response.go
+++ b/server/core/json_response.go
@@ -20,29 +20,29 @@ type JSONResponse struct {
 
 // Standard sends a JSON response with the status code 200.
 func (j *JSONResponse) Standard(v interface{}) {
-	j.writer.WriteHeader(http.StatusOK)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusOK)
 	j.writer.Write(j.toJSON(v))
 }
 
 // Created sends a JSON response with the status code 201.
 func (j *JSONResponse) Created(v interface{}) {
-	j.writer.WriteHeader(http.StatusCreated)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusCreated)
 	j.writer.Write(j.toJSON(v))
 }
 
 // NoContent sends a JSON response with the status code 204.
 func (j *JSONResponse) NoContent() {
-	j.writer.WriteHeader(http.StatusNoContent)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusNoContent)
 }
 
 // BadRequest sends a JSON response with the status code 400.
 func (j *JSONResponse) BadRequest(err error) {
 	logger.Error("[Bad Request] %v", err)
-	j.writer.WriteHeader(http.StatusBadRequest)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusBadRequest)
 
 	if err != nil {
 		j.writer.Write(j.encodeError(err))
@@ -52,16 +52,16 @@ func (j *JSONResponse) BadRequest(err error) {
 // NotFound sends a JSON response with the status code 404.
 func (j *JSONResponse) NotFound(err error) {
 	logger.Error("[Not Found] %v", err)
-	j.writer.WriteHeader(http.StatusNotFound)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusNotFound)
 	j.writer.Write(j.encodeError(err))
 }
 
 // ServerError sends a JSON response with the status code 500.
 func (j *JSONResponse) ServerError(err error) {
 	logger.Error("[Internal Server Error] %v", err)
-	j.writer.WriteHeader(http.StatusInternalServerError)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusInternalServerError)
 
 	if err != nil {
 		j.writer.Write(j.encodeError(err))
@@ -71,14 +71,14 @@ func (j *JSONResponse) ServerError(err error) {
 // Forbidden sends a JSON response with the status code 403.
 func (j *JSONResponse) Forbidden() {
 	logger.Info("[API:Forbidden]")
-	j.writer.WriteHeader(http.StatusForbidden)
 	j.commonHeaders()
+	j.writer.WriteHeader(http.StatusForbidden)
 	j.writer.Write(j.encodeError(errors.New("Access Forbidden")))
 }
 
 func (j *JSONResponse) commonHeaders() {
 	j.writer.Header().Set("Accept", "application/json")
-	j.writer.Header().Set("Content-Type", "application/json")
+	j.writer.Header().Set("Content-Type", "application/json; charset=utf-8")
 }
 
 func (j *JSONResponse) encodeError(err error) []byte {
diff --git a/server/core/response.go b/server/core/response.go
index 7b2deaa4..f3fc7a10 100644
--- a/server/core/response.go
+++ b/server/core/response.go
@@ -48,6 +48,7 @@ func (r *Response) Redirect(path string) {
 
 // NotModified sends a response with a 304 status code.
 func (r *Response) NotModified() {
+	r.commonHeaders()
 	r.writer.WriteHeader(http.StatusNotModified)
 }