From c0f99e82299a3f9a6679ae6d643f854418ca16af Mon Sep 17 00:00:00 2001 From: awwalker Date: Fri, 24 Feb 2017 16:39:49 -0500 Subject: [PATCH] API: support /users/:username/repos clean up fix arguments remove repeated token give admins listing rights --- routers/api/v1/api.go | 6 ++-- routers/api/v1/repo/repo.go | 30 ------------------ routers/api/v1/user/repo.go | 62 +++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 32 deletions(-) create mode 100644 routers/api/v1/user/repo.go diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index f89d6e3445..9431dac017 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -242,6 +242,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:username", func() { m.Get("", user.GetInfo) + m.Get("/repos", user.ListUserRepos) m.Group("/tokens", func() { m.Combo("").Get(user.ListAccessTokens). Post(bind(api.CreateAccessTokenOption{}), user.CreateAccessToken) @@ -284,6 +285,9 @@ func RegisterRoutes(m *macaron.Macaron) { Delete(user.DeletePublicKey) }) + m.Combo("/repos").Get(user.ListMyRepos). + Post(bind(api.CreateRepoOption{}), repo.Create) + m.Group("/starred", func() { m.Get("", user.GetMyStarredRepos) m.Group("/:username/:reponame", func() { @@ -297,8 +301,6 @@ func RegisterRoutes(m *macaron.Macaron) { }, reqToken()) // Repositories - m.Combo("/user/repos", reqToken()).Get(repo.ListMyRepos). - Post(bind(api.CreateRepoOption{}), repo.Create) m.Post("/org/:org/repos", reqToken(), bind(api.CreateRepoOption{}), repo.CreateOrgRepo) m.Group("/repos", func() { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index cbcc10a4d4..a43246624e 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -81,36 +81,6 @@ func Search(ctx *context.APIContext) { }) } -// ListMyRepos list all my repositories -// see https://github.com/gogits/go-gogs-client/wiki/Repositories#list-your-repositories -func ListMyRepos(ctx *context.APIContext) { - ownRepos, err := models.GetUserRepositories(ctx.User.ID, true, 1, ctx.User.NumRepos, "") - if err != nil { - ctx.Error(500, "GetRepositories", err) - return - } - numOwnRepos := len(ownRepos) - - accessibleRepos, err := ctx.User.GetRepositoryAccesses() - if err != nil { - ctx.Error(500, "GetRepositoryAccesses", err) - return - } - - repos := make([]*api.Repository, numOwnRepos+len(accessibleRepos)) - for i := range ownRepos { - repos[i] = ownRepos[i].APIFormat(models.AccessModeOwner) - } - i := numOwnRepos - - for repo, access := range accessibleRepos { - repos[i] = repo.APIFormat(access) - i++ - } - - ctx.JSON(200, &repos) -} - // CreateUserRepo create a repository for a user func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateRepoOption) { repo, err := models.CreateRepository(owner, models.CreateRepoOptions{ diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go new file mode 100644 index 0000000000..d80e3a9baf --- /dev/null +++ b/routers/api/v1/user/repo.go @@ -0,0 +1,62 @@ +package user + +import ( + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + api "code.gitea.io/sdk/gitea" +) + +// listUserRepos - List the repositories owned by the given user. +func listUserRepos(ctx *context.APIContext, u *models.User) { + userID := u.ID + showPrivateRepos := (ctx.User.ID == userID || ctx.User.IsAdmin) && ctx.IsSigned + ownRepos, err := models.GetUserRepositories(userID, showPrivateRepos, 1, u.NumRepos, "") + if err != nil { + ctx.Error(500, "GetUserRepositories", err) + return + } + accessibleRepos, err := getAccessibleRepos(ctx) + if err != nil { + ctx.Error(500, "GetAccessibleRepos", err) + } + apiRepos := make([]*api.Repository, len(ownRepos)+len(accessibleRepos)) + // Set owned repositories. + for i := range ownRepos { + apiRepos[i] = ownRepos[i].APIFormat(models.AccessModeOwner) + } + // Set repositories user has access to. + for i := len(ownRepos); i < len(apiRepos); i++ { + apiRepos[i] = accessibleRepos[i] + } + ctx.JSON(200, &apiRepos) +} + +// ListUserRepos - list the repos owned and accessible by the given user. +func ListUserRepos(ctx *context.APIContext) { + user := GetUserByParams(ctx) + if ctx.Written() { + return + } + listUserRepos(ctx, user) +} + +// ListMyRepos - list the repositories owned by you. +// see https://github.com/gogits/go-gogs-client/wiki/Repositories#list-your-repositories +func ListMyRepos(ctx *context.APIContext) { + listUserRepos(ctx, ctx.User) +} + +// getAccessibleRepos - Get the repositories a user has access to. +func getAccessibleRepos(ctx *context.APIContext) ([]*api.Repository, error) { + accessibleRepos, err := ctx.User.GetRepositoryAccesses() + if err != nil { + return nil, err + } + i := 0 + repos := make([]*api.Repository, len(accessibleRepos)) + for repo, access := range accessibleRepos { + repos[i] = repo.APIFormat(access) + i++ + } + return repos, nil +}