From d27ca649c7e5ccec97ba285cc529c7b3d8f71ac4 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 4 Apr 2016 19:41:34 -0400 Subject: [PATCH] api/admin: add/remove organization team repository --- routers/api/v1/admin/org_repo.go | 49 ++++++++++++++++++++++++++++++++ routers/api/v1/api.go | 43 ++++++++++++++++------------ 2 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 routers/api/v1/admin/org_repo.go diff --git a/routers/api/v1/admin/org_repo.go b/routers/api/v1/admin/org_repo.go new file mode 100644 index 000000000..71c84ad0e --- /dev/null +++ b/routers/api/v1/admin/org_repo.go @@ -0,0 +1,49 @@ +// Copyright 2016 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package admin + +import ( + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/context" +) + +func GetRepositoryByParams(ctx *context.APIContext) *models.Repository { + repo, err := models.GetRepositoryByName(ctx.Org.Team.OrgID, ctx.Params(":reponame")) + if err != nil { + if models.IsErrRepoNotExist(err) { + ctx.Status(404) + } else { + ctx.Error(500, "GetRepositoryByName", err) + } + return nil + } + return repo +} + +func AddTeamRepository(ctx *context.APIContext) { + repo := GetRepositoryByParams(ctx) + if ctx.Written() { + return + } + if err := ctx.Org.Team.AddRepository(repo); err != nil { + ctx.Error(500, "AddRepository", err) + return + } + + ctx.Status(204) +} + +func RemoveTeamRepository(ctx *context.APIContext) { + repo := GetRepositoryByParams(ctx) + if ctx.Written() { + return + } + if err := ctx.Org.Team.RemoveRepository(repo.ID); err != nil { + ctx.Error(500, "RemoveRepository", err) + return + } + + ctx.Status(204) +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 34a441f41..5050b8cb7 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -112,24 +112,29 @@ func ReqAdmin() macaron.Handler { func OrgAssignment(args ...bool) macaron.Handler { var ( + assignOrg bool assignTeam bool ) - if len(args) > 0 { - assignTeam = args[0] + assignOrg = args[0] + } + if len(args) > 1 { + assignTeam = args[1] } return func(ctx *context.APIContext) { - org, err := models.GetUserByName(ctx.Params(":orgname")) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Status(404) - } else { - ctx.Error(500, "GetUserByName", err) + ctx.Org = new(context.APIOrganization) + + var err error + if assignOrg { + ctx.Org.Organization, err = models.GetUserByName(ctx.Params(":orgname")) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Status(404) + } else { + ctx.Error(500, "GetUserByName", err) + } + return } - return - } - ctx.Org = &context.APIOrganization{ - Organization: org, } if assignTeam { @@ -244,7 +249,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/orgs/:orgname", func() { m.Combo("").Get(org.Get).Patch(bind(api.EditOrgOption{}), org.Edit) m.Combo("/teams").Get(org.ListTeams) - }, OrgAssignment()) + }, OrgAssignment(true)) m.Any("/*", func(ctx *context.Context) { ctx.Error(404) @@ -265,13 +270,15 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/orgs/:orgname", func() { m.Group("/teams", func() { - m.Post("", OrgAssignment(), bind(api.CreateTeamOption{}), admin.CreateTeam) - - m.Group("/:teamid", func() { - m.Combo("/memberships/:username").Put(admin.AddTeamMember).Delete(admin.RemoveTeamMember) - }, OrgAssignment(true)) + m.Post("", OrgAssignment(true), bind(api.CreateTeamOption{}), admin.CreateTeam) }) }) + m.Group("/teams", func() { + m.Group("/:teamid", func() { + m.Combo("/members/:username").Put(admin.AddTeamMember).Delete(admin.RemoveTeamMember) + m.Combo("/repos/:reponame").Put(admin.AddTeamRepository).Delete(admin.RemoveTeamRepository) + }, OrgAssignment(false, true)) + }) }, ReqAdmin()) }, context.APIContexter()) }