Various fixes:

nil point dereference
panic on wrong content-type

Signed-off-by: David Kröll <[email protected]>

Author: davidkroell

main.go

@@ -37,5 +37,5 @@ func main() {
 	}
 
 	router := routes.InitRouter()
-	log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), router))
+	log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), &router))
 }

models/database.go

@@ -39,7 +39,7 @@ func InitDatabase(config DBConfig) *Database {
 		database.SetMaxIdleConns(4)
 
 		// check if database is available
-		if err := db.Ping(); err != nil {
+		if err := database.Ping(); err != nil {
 			log.Fatal(err)
 		}
 

routes/http_bodies.go

@@ -0,0 +1,5 @@
+package routes
+
+type ErrorResponse struct {
+	Message string `json:"message"`
+}

routes/middlewares.go

@@ -1,6 +1,7 @@
 package routes
 
 import (
+	"encoding/json"
 	"log"
 	"net/http"
 )
@@ -24,7 +25,10 @@ func HeaderBinding(next http.Handler) http.Handler {
 
 		if r.Method == "POST" {
 			if r.Header.Get("Content-Type") != "application/json" {
-				log.Fatal("Wrong Content-Type in POST request. application/json expected")
+				_ = json.NewEncoder(w).Encode(ErrorResponse{
+					"Wrong Content-Type in POST request. application/json expected",
+				})
+				return
 			}
 		}
 

routes/router.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func InitRouter() (router *mux.Router) {
+func InitRouter() (router mux.Router) {
 	router.Use(RequestLogger, HeaderBinding)
 	router.HandleFunc("/users/auth/new", registerUser).Methods("POST")
 	router.HandleFunc("/users/auth", loginUser).Methods("POST")