From 5049cbf2369841cb372b9b95154e71a94fbda92b Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 1 Sep 2024 19:36:26 +0200 Subject: [PATCH] chore(web): always set internal error (cherry picked from commit 5c56d07215a2a1fac63c565eac669fe8c1f19cbc) --- pkg/web/handler/create.go | 8 ++++---- pkg/web/handler/delete.go | 6 +++--- pkg/web/handler/helper.go | 4 ++-- pkg/web/handler/read_all.go | 10 +++++----- pkg/web/handler/read_one.go | 6 +++--- pkg/web/handler/update.go | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/web/handler/create.go b/pkg/web/handler/create.go index 0932be2a9..36a73a28e 100644 --- a/pkg/web/handler/create.go +++ b/pkg/web/handler/create.go @@ -38,20 +38,20 @@ func (c *WebHandler) CreateWeb(ctx echo.Context) error { log.Debugf("Invalid model error. Internal error was: %s", err.Error()) var he *echo.HTTPError if errors.As(err, &he) { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)).SetInternal(err) } - return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.") + return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.").SetInternal(err) } // Validate the struct if err := ctx.Validate(currentStruct); err != nil { - return echo.NewHTTPError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err).SetInternal(err) } // Get the user to pass for later checks currentAuth, err := auth.GetAuthFromClaims(ctx) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.") + return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.").SetInternal(err) } // Create the db session diff --git a/pkg/web/handler/delete.go b/pkg/web/handler/delete.go index 599c81cf9..f58aed15d 100644 --- a/pkg/web/handler/delete.go +++ b/pkg/web/handler/delete.go @@ -43,15 +43,15 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error { log.Debugf("Invalid model error. Internal error was: %s", err.Error()) var he *echo.HTTPError if errors.As(err, &he) { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)).SetInternal(err) } - return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.") + return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.").SetInternal(err) } // Check if the user has the right to delete currentAuth, err := auth.GetAuthFromClaims(ctx) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError) + return echo.NewHTTPError(http.StatusInternalServerError).SetInternal(err) } // Create the db session diff --git a/pkg/web/handler/helper.go b/pkg/web/handler/helper.go index ed24057d6..117cc9467 100644 --- a/pkg/web/handler/helper.go +++ b/pkg/web/handler/helper.go @@ -42,7 +42,7 @@ func HandleHTTPError(err error) *echo.HTTPError { log.Error(err.Error()) if a, has := err.(web.HTTPErrorProcessor); has { errDetails := a.HTTPError() - return echo.NewHTTPError(errDetails.HTTPCode, errDetails) + return echo.NewHTTPError(errDetails.HTTPCode, errDetails).SetInternal(err) } - return echo.NewHTTPError(http.StatusInternalServerError) + return echo.NewHTTPError(http.StatusInternalServerError).SetInternal(err) } diff --git a/pkg/web/handler/read_all.go b/pkg/web/handler/read_all.go index dae6b298b..61ca989fa 100644 --- a/pkg/web/handler/read_all.go +++ b/pkg/web/handler/read_all.go @@ -38,7 +38,7 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error { currentAuth, err := auth.GetAuthFromClaims(ctx) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.") + return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.").SetInternal(err) } // Get the object & bind params to struct @@ -46,9 +46,9 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error { log.Debugf("Invalid model error. Internal error was: %s", err.Error()) var he *echo.HTTPError if errors.As(err, &he) { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)).SetInternal(err) } - return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.") + return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.").SetInternal(err) } // Pagination @@ -59,7 +59,7 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error { pageNumber, err := strconv.Atoi(page) if err != nil { log.Error(err.Error()) - return echo.NewHTTPError(http.StatusBadRequest, "Bad page requested.") + return echo.NewHTTPError(http.StatusBadRequest, "Bad page requested.").SetInternal(err) } if pageNumber < 0 { return echo.NewHTTPError(http.StatusBadRequest, "Page number cannot be negative.") @@ -74,7 +74,7 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error { perPageNumber, err = strconv.Atoi(perPage) if err != nil { log.Error(err.Error()) - return echo.NewHTTPError(http.StatusBadRequest, "Bad per page amount requested.") + return echo.NewHTTPError(http.StatusBadRequest, "Bad per page amount requested.").SetInternal(err) } } // Set default page count diff --git a/pkg/web/handler/read_one.go b/pkg/web/handler/read_one.go index 1b742a580..8e89c72a2 100644 --- a/pkg/web/handler/read_one.go +++ b/pkg/web/handler/read_one.go @@ -39,15 +39,15 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error { log.Debugf("Invalid model error. Internal error was: %s", err.Error()) var he *echo.HTTPError if errors.As(err, &he) { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)).SetInternal(err) } - return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.") + return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.").SetInternal(err) } // Check rights currentAuth, err := auth.GetAuthFromClaims(ctx) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.") + return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.").SetInternal(err) } // Create the db session diff --git a/pkg/web/handler/update.go b/pkg/web/handler/update.go index 3e58d97c3..baaaf48c9 100644 --- a/pkg/web/handler/update.go +++ b/pkg/web/handler/update.go @@ -39,20 +39,20 @@ func (c *WebHandler) UpdateWeb(ctx echo.Context) error { log.Debugf("Invalid model error. Internal error was: %s", err.Error()) var he *echo.HTTPError if errors.As(err, &he) { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message)).SetInternal(err) } - return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.") + return echo.NewHTTPError(http.StatusBadRequest, "Invalid model provided.").SetInternal(err) } // Validate the struct if err := ctx.Validate(currentStruct); err != nil { - return echo.NewHTTPError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err).SetInternal(err) } // Check if the user has the right to do that currentAuth, err := auth.GetAuthFromClaims(ctx) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.") + return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.").SetInternal(err) } // Create the db session