mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 20:22:14 +02:00
Return 404
in the API if the requested webhooks were not found (#24823)
Should resolve first point of the issue https://github.com/go-gitea/gitea/issues/24574
This commit is contained in:
parent
6b33152b7d
commit
1dfaf83798
1 changed files with 7 additions and 2 deletions
|
@ -4,6 +4,7 @@
|
||||||
package admin
|
package admin
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/webhook"
|
"code.gitea.io/gitea/models/webhook"
|
||||||
|
@ -74,7 +75,11 @@ func GetHook(ctx *context.APIContext) {
|
||||||
hookID := ctx.ParamsInt64(":id")
|
hookID := ctx.ParamsInt64(":id")
|
||||||
hook, err := webhook.GetSystemOrDefaultWebhook(ctx, hookID)
|
hook, err := webhook.GetSystemOrDefaultWebhook(ctx, hookID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetSystemOrDefaultWebhook", err)
|
if errors.Is(err, util.ErrNotExist) {
|
||||||
|
ctx.NotFound()
|
||||||
|
} else {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetSystemOrDefaultWebhook", err)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h, err := webhook_service.ToHook("/admin/", hook)
|
h, err := webhook_service.ToHook("/admin/", hook)
|
||||||
|
@ -160,7 +165,7 @@ func DeleteHook(ctx *context.APIContext) {
|
||||||
|
|
||||||
hookID := ctx.ParamsInt64(":id")
|
hookID := ctx.ParamsInt64(":id")
|
||||||
if err := webhook.DeleteDefaultSystemWebhook(ctx, hookID); err != nil {
|
if err := webhook.DeleteDefaultSystemWebhook(ctx, hookID); err != nil {
|
||||||
if webhook.IsErrWebhookNotExist(err) {
|
if errors.Is(err, util.ErrNotExist) {
|
||||||
ctx.NotFound()
|
ctx.NotFound()
|
||||||
} else {
|
} else {
|
||||||
ctx.Error(http.StatusInternalServerError, "DeleteDefaultSystemWebhook", err)
|
ctx.Error(http.StatusInternalServerError, "DeleteDefaultSystemWebhook", err)
|
||||||
|
|
Loading…
Reference in a new issue