ami/tl-vikunja
1
0
Fork 0
Code Activity

chore(errors): always add internal error to echo error

Browse Source 
(cherry picked from commit 7a7e97770c9ecc10e805069ae16c2ffa2779d2a5)
This commit is contained in:
kolaente
2024-08-29 15:39:34 +02:00
parent 39d0409f57
commit cfa58ae599
14 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/routes/api/v1/user_deletion.go
View File

@ -65,18 +65,18 @@ func UserRequestDeletion(c echo.Context) error {
if u.IsLocalUser() {
var deletionRequest UserPasswordConfirmation
if err := c.Bind(&deletionRequest); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "No password provided.")
return echo.NewHTTPError(http.StatusBadRequest, "No password provided.").SetInternal(err)
}
err = c.Validate(deletionRequest)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err)
return echo.NewHTTPError(http.StatusBadRequest, err).SetInternal(err)
}
err = user.CheckUserPassword(u, deletionRequest.Password)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err, c).SetInternal(err)
}
}
@ -109,12 +109,12 @@ func UserRequestDeletion(c echo.Context) error {
func UserConfirmDeletion(c echo.Context) error {
var deleteConfirmation UserDeletionRequestConfirm
if err := c.Bind(&deleteConfirmation); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "No token provided.")
return echo.NewHTTPError(http.StatusBadRequest, "No token provided.").SetInternal(err)
}
err := c.Validate(deleteConfirmation)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err)
return echo.NewHTTPError(http.StatusBadRequest, err).SetInternal(err)
}
s := db.NewSession()
@ -176,12 +176,12 @@ func UserCancelDeletion(c echo.Context) error {
if u.IsLocalUser() {
var deletionRequest UserPasswordConfirmation
if err := c.Bind(&deletionRequest); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "No password provided.")
return echo.NewHTTPError(http.StatusBadRequest, "No password provided.").SetInternal(err)
}
err = c.Validate(deletionRequest)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err)
return echo.NewHTTPError(http.StatusBadRequest, err).SetInternal(err)
}
err = user.CheckUserPassword(u, deletionRequest.Password)