tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-03 09:07:19 +00:00
Code Releases Activity

Fix team members API (#6714) (#6729)

Browse Source
This commit is contained in:
Lunny Xiao
2019-04-24 20:41:02 +08:00
committed by GitHub
parent b1cb52e477
commit 5f6b118007
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
routers/api/v1/api.go
View File

@ -280,6 +280,43 @@ func reqOrgMembership() macaron.Handler {
}
}
// reqTeamMembership user should be an team member, or a site admin
func reqTeamMembership() macaron.Handler {
return func(ctx *context.APIContext) {
if ctx.User.IsAdmin {
return
}
if ctx.Org.Team == nil {
ctx.Error(500, "", "reqTeamMembership: unprepared context")
return
}
var orgID = ctx.Org.Team.OrgID
isOwner, err := models.IsOrganizationOwner(orgID, ctx.User.ID)
if err != nil {
ctx.Error(500, "IsOrganizationOwner", err)
return
} else if isOwner {
return
}
if isTeamMember, err := models.IsTeamMember(orgID, ctx.Org.Team.ID, ctx.User.ID); err != nil {
ctx.Error(500, "IsTeamMember", err)
return
} else if !isTeamMember {
isOrgMember, err := models.IsOrganizationMember(orgID, ctx.User.ID)
if err != nil {
ctx.Error(500, "IsOrganizationMember", err)
} else if isOrgMember {
ctx.Error(403, "", "Must be a team member")
} else {
ctx.Status(404)
}
return
}
}
}
func reqOrgOwnership() macaron.Handler {
return func(ctx *context.APIContext) {
var orgID int64
@ -686,7 +723,7 @@ func RegisterRoutes(m *macaron.Macaron) {
Put(org.AddTeamRepository).
Delete(org.RemoveTeamRepository)
})
}, orgAssignment(false, true), reqToken(), reqOrgMembership())
}, orgAssignment(false, true), reqToken(), reqTeamMembership())
m.Any("/*", func(ctx *context.Context) {
ctx.Error(404)