sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use APIErrorInternal for internal server errors 

Replace all ctx.APIError(http.StatusInternalServerError, err) calls
with ctx.APIErrorInternal(err) to match Gitea's standard error
handling conventions.

Signed-off-by: SBALAVIGNESH123 <balavignesh449@gmail.com>
pull/36113/head
SBALAVIGNESH123 2025-12-10 02:24:09 +07:00
parent b0d693fb5e
commit 3aa0c6f9a9
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
routers/api/v1/org/org_actions_permissions.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"net/http"
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/services/context"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/context"
)
// GetActionsPermissions returns the Actions token permissions for an organization
@ -36,7 +36,7 @@ func GetActionsPermissions(ctx *context.APIContext) {
// Only org owners should be able to modify these settings.
isOwner, err := ctx.Org.Organization.IsOwnedBy(ctx, ctx.Doer.ID)
if err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
} else if !isOwner {
ctx.APIError(http.StatusForbidden, "You must be an organization owner")
@ -45,7 +45,7 @@ func GetActionsPermissions(ctx *context.APIContext) {
perms, err := actions_model.GetOrgActionPermissions(ctx, ctx.Org.Organization.ID)
if err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -131,7 +131,7 @@ func UpdateActionsPermissions(ctx *context.APIContext) {
}
if err := actions_model.CreateOrUpdateOrgPermissions(ctx, perm); err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -177,7 +177,7 @@ func ListCrossRepoAccess(ctx *context.APIContext) {
rules, err := actions_model.ListCrossRepoAccessRules(ctx, ctx.Org.Organization.ID)
if err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -245,7 +245,7 @@ func AddCrossRepoAccess(ctx *context.APIContext) {
}
if err := actions_model.CreateCrossRepoAccess(ctx, rule); err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -300,7 +300,7 @@ func DeleteCrossRepoAccess(ctx *context.APIContext) {
}
if err := actions_model.DeleteCrossRepoAccess(ctx, ruleID); err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -336,4 +336,3 @@ func convertToCrossRepoAccessRule(rule *actions_model.ActionCrossRepoAccess) *ap
AccessLevel: rule.AccessLevel,
}
}

9
routers/api/v1/repo/repo_actions_permissions.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"net/http"
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/services/context"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/context"
)
// GetActionsPermissions returns the Actions token permissions for a repository
@ -47,7 +47,7 @@ func GetActionsPermissions(ctx *context.APIContext) {
perms, err := actions_model.GetRepoActionPermissions(ctx, ctx.Repo.Repository.ID)
if err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -135,7 +135,7 @@ func UpdateActionsPermissions(ctx *context.APIContext) {
}
if err := actions_model.CreateOrUpdateRepoPermissions(ctx, perm); err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -181,7 +181,7 @@ func ResetActionsPermissions(ctx *context.APIContext) {
}
if err := actions_model.CreateOrUpdateRepoPermissions(ctx, defaultPerm); err != nil {
ctx.APIError(http.StatusInternalServerError, err)
ctx.APIErrorInternal(err)
return
}
@ -206,4 +206,3 @@ func convertToAPIPermissions(perm *actions_model.ActionTokenPermission) *api.Act
MetadataRead: perm.MetadataRead,
}
}