use echo.NewHTTPError

This commit is contained in:
konrad 2018-07-11 14:27:16 +02:00 committed by kolaente
parent 4213f3b08c
commit 4734a0a6a6
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
5 changed files with 10 additions and 10 deletions

View File

@ -10,7 +10,7 @@ import (
func (c *WebHandler) CreateWeb(ctx echo.Context) error { func (c *WebHandler) CreateWeb(ctx echo.Context) error {
// Get the object // Get the object
if err := ctx.Bind(&c.CObject); err != nil { if err := ctx.Bind(&c.CObject); err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"No model provided."}) return echo.NewHTTPError(http.StatusBadRequest, "No or invalid model provided.")
} }
// Get the user to pass for later checks // Get the user to pass for later checks

View File

@ -11,7 +11,7 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error {
// Get the ID // Get the ID
id, err := models.GetIntURLParam("id", ctx) id, err := models.GetIntURLParam("id", ctx)
if err != nil { if err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"Invalid ID."}) return echo.NewHTTPError(http.StatusBadRequest, "Invalid ID.")
} }
// Check if the user has the right to delete // Check if the user has the right to delete

View File

@ -10,12 +10,12 @@ import (
func (c *WebHandler) ReadAllWeb(ctx echo.Context) error { func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
currentUser, err := models.GetCurrentUser(ctx) currentUser, err := models.GetCurrentUser(ctx)
if err != nil { if err != nil {
return ctx.JSON(http.StatusInternalServerError, models.Message{"Could not determine the current user."}) return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
} }
lists, err := c.CObject.ReadAll(&currentUser) lists, err := c.CObject.ReadAll(&currentUser)
if err != nil { if err != nil {
return ctx.JSON(http.StatusInternalServerError, models.Message{"Could not get."}) return echo.NewHTTPError(http.StatusInternalServerError, "An error occured.")
} }
return ctx.JSON(http.StatusOK, lists) return ctx.JSON(http.StatusOK, lists)

View File

@ -12,7 +12,7 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
// Get the ID // Get the ID
id, err := models.GetIntURLParam("id", ctx) id, err := models.GetIntURLParam("id", ctx)
if err != nil { if err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"Invalid ID."}) return echo.NewHTTPError(http.StatusBadRequest, "Invalid ID.")
} }
// TODO check rights // TODO check rights
@ -21,10 +21,10 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
err = c.CObject.ReadOne(id) err = c.CObject.ReadOne(id)
if err != nil { if err != nil {
if models.IsErrListDoesNotExist(err) { if models.IsErrListDoesNotExist(err) {
return ctx.JSON(http.StatusNotFound, models.Message{"Not found."}) return echo.NewHTTPError(http.StatusNotFound)
} }
return ctx.JSON(http.StatusInternalServerError, models.Message{"An error occured."}) return echo.NewHTTPError(http.StatusInternalServerError, "An error occured.")
} }
return ctx.JSON(http.StatusOK, c.CObject) return ctx.JSON(http.StatusOK, c.CObject)

View File

@ -11,19 +11,19 @@ import (
func (c *WebHandler) UpdateWeb(ctx echo.Context) error { func (c *WebHandler) UpdateWeb(ctx echo.Context) error {
// Get the object // Get the object
if err := ctx.Bind(&c.CObject); err != nil { if err := ctx.Bind(&c.CObject); err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"No model provided."}) return echo.NewHTTPError(http.StatusBadRequest, "No or invalid model provided.")
} }
// Get the ID // Get the ID
id, err := models.GetIntURLParam("id", ctx) id, err := models.GetIntURLParam("id", ctx)
if err != nil { if err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"Invalid ID."}) return echo.NewHTTPError(http.StatusBadRequest, "Invalid ID.")
} }
// Check if the user has the right to do that // Check if the user has the right to do that
currentUser, err := models.GetCurrentUser(ctx) currentUser, err := models.GetCurrentUser(ctx)
if err != nil { if err != nil {
return ctx.JSON(http.StatusInternalServerError, models.Message{"Could not determine the current user."}) return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
} }
// Do the update // Do the update