summaryrefslogtreecommitdiffstats
path: root/routers/api/v1/repo/repo.go
diff options
context:
space:
mode:
authorEthan Koenig <ethantkoenig@gmail.com>2016-12-05 18:48:51 -0500
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-12-07 12:55:24 +0100
commit04b9a7e7a22d968790aeee9c316391252b0aaf67 (patch)
treeeb7af4ff5dbe06439511779331aac0b2de3a8c04 /routers/api/v1/repo/repo.go
parent08b9af9ad8861352d1b68d15b33ef265352a2f4a (diff)
downloadgitea-04b9a7e7a22d968790aeee9c316391252b0aaf67.tar.gz
gitea-04b9a7e7a22d968790aeee9c316391252b0aaf67.zip
Bug fixes for repo permissions in API
Also move duplicated code into repo.APIFormat(..)
Diffstat (limited to 'routers/api/v1/repo/repo.go')
-rw-r--r--routers/api/v1/repo/repo.go26
1 files changed, 16 insertions, 10 deletions
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 0c5c1ef5fd..35e6554273 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -95,16 +95,12 @@ func ListMyRepos(ctx *context.APIContext) {
repos := make([]*api.Repository, numOwnRepos+len(accessibleRepos))
for i := range ownRepos {
- repos[i] = ownRepos[i].APIFormat(&api.Permission{true, true, true})
+ repos[i] = ownRepos[i].APIFormat(models.AccessModeOwner)
}
i := numOwnRepos
for repo, access := range accessibleRepos {
- repos[i] = repo.APIFormat(&api.Permission{
- Admin: access >= models.AccessModeAdmin,
- Push: access >= models.AccessModeWrite,
- Pull: true,
- })
+ repos[i] = repo.APIFormat(access)
i++
}
@@ -138,7 +134,7 @@ func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateR
return
}
- ctx.JSON(201, repo.APIFormat(&api.Permission{true, true, true}))
+ ctx.JSON(201, repo.APIFormat(models.AccessModeOwner))
}
// Create one repository of mine
@@ -241,14 +237,19 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
}
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
- ctx.JSON(201, repo.APIFormat(&api.Permission{true, true, true}))
+ ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
}
// Get one repository
// see https://github.com/gogits/go-gogs-client/wiki/Repositories#get
func Get(ctx *context.APIContext) {
repo := ctx.Repo.Repository
- ctx.JSON(200, repo.APIFormat(&api.Permission{true, true, true}))
+ access, err := models.AccessLevel(ctx.User, repo)
+ if err != nil {
+ ctx.Error(500, "GetRepository", err)
+ return
+ }
+ ctx.JSON(200, repo.APIFormat(access))
}
// GetByID returns a single Repository
@@ -263,7 +264,12 @@ func GetByID(ctx *context.APIContext) {
return
}
- ctx.JSON(200, repo.APIFormat(&api.Permission{true, true, true}))
+ access, err := models.AccessLevel(ctx.User, repo)
+ if err != nil {
+ ctx.Error(500, "GetRepositoryByID", err)
+ return
+ }
+ ctx.JSON(200, repo.APIFormat(access))
}
// Delete one repository