Skip to content

Commit

Permalink
bug fixed for API to get user's repos (#1622)
Browse files Browse the repository at this point in the history
* bug fixed for API to get user's repos

* add tests and fix another place

* test user2 since user1 has no repos
  • Loading branch information
lunny authored Apr 29, 2017
1 parent cebe3a6 commit 61b08b5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 4 deletions.
23 changes: 23 additions & 0 deletions integrations/api_repo_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2017 The Gitea 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 integrations

import (
"net/http"
"testing"

"code.gitea.io/gitea/models"

"github.com/stretchr/testify/assert"
)

func TestAPIUserReposNotLogin(t *testing.T) {
assert.NoError(t, models.LoadFixtures())

req, err := http.NewRequest("GET", "/api/v1/users/user2/repos", nil)
assert.NoError(t, err)
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}
11 changes: 7 additions & 4 deletions routers/api/v1/user/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@ import (
// 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
showPrivateRepos := ctx.IsSigned && (ctx.User.ID == userID || ctx.User.IsAdmin)
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)
var accessibleRepos []*api.Repository
if ctx.User != nil {
accessibleRepos, err = getAccessibleRepos(ctx)
if err != nil {
ctx.Error(500, "GetAccessibleRepos", err)
}
}
apiRepos := make([]*api.Repository, len(ownRepos)+len(accessibleRepos))
// Set owned repositories.
Expand Down

0 comments on commit 61b08b5

Please sign in to comment.