mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Fix some user name usages (#33689)
1. GetUserOrgsList should "order by" lower_name 2. GetIssuePostersWithSearch should search in-case-sensitive-ly 3. LoginName should not be used as username By the way, remove unnecessary "onGiteaRun"
This commit is contained in:
wxiaoguang
GitHub
@@ -5,7 +5,6 @@ package integration
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
"testing"
|
||||
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
@@ -14,132 +13,145 @@ import (
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestAPIRepoCollaboratorPermission(t *testing.T) {
|
||||
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
||||
repo2Owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo2.OwnerID})
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
||||
repo2Owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo2.OwnerID})
|
||||
|
||||
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
||||
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
||||
user10 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 10})
|
||||
user11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 11})
|
||||
user34 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 34})
|
||||
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
||||
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
||||
user10 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 10})
|
||||
user11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 11})
|
||||
user34 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 34})
|
||||
|
||||
testCtx := NewAPITestContext(t, repo2Owner.Name, repo2.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||
testCtx := NewAPITestContext(t, repo2Owner.Name, repo2.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||
|
||||
t.Run("RepoOwnerShouldBeOwner", func(t *testing.T) {
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, repo2Owner.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
t.Run("RepoOwnerShouldBeOwner", func(t *testing.T) {
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, repo2Owner.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "owner", repoPermission.Permission)
|
||||
})
|
||||
assert.Equal(t, "owner", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorWithReadAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeRead))
|
||||
t.Run("CollaboratorWithReadAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeRead))
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorWithWriteAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithWriteAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeWrite))
|
||||
t.Run("CollaboratorWithWriteAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithWriteAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeWrite))
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "write", repoPermission.Permission)
|
||||
})
|
||||
assert.Equal(t, "write", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorWithAdminAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithAdminAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeAdmin))
|
||||
t.Run("CollaboratorWithAdminAccess", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithAdminAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeAdmin))
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name).
|
||||
AddTokenAuth(testCtx.Token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "admin", repoPermission.Permission)
|
||||
})
|
||||
assert.Equal(t, "admin", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorNotFound", func(t *testing.T) {
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, "non-existent-user").
|
||||
AddTokenAuth(testCtx.Token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
})
|
||||
t.Run("CollaboratorNotFound", func(t *testing.T) {
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, "non-existent-user").
|
||||
AddTokenAuth(testCtx.Token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorBlocked", func(t *testing.T) {
|
||||
ctx := NewAPITestContext(t, repo2Owner.Name, repo2.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||
ctx.ExpectedCode = http.StatusForbidden
|
||||
doAPIAddCollaborator(ctx, user34.Name, perm.AccessModeAdmin)(t)
|
||||
})
|
||||
t.Run("CollaboratorBlocked", func(t *testing.T) {
|
||||
ctx := NewAPITestContext(t, repo2Owner.Name, repo2.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||
ctx.ExpectedCode = http.StatusForbidden
|
||||
doAPIAddCollaborator(ctx, user34.Name, perm.AccessModeAdmin)(t)
|
||||
})
|
||||
|
||||
t.Run("CollaboratorCanQueryItsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user5.Name, perm.AccessModeRead))
|
||||
t.Run("CollaboratorCanQueryItsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user5.Name, perm.AccessModeRead))
|
||||
|
||||
_session := loginUser(t, user5.Name)
|
||||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
_session := loginUser(t, user5.Name)
|
||||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
|
||||
t.Run("CollaboratorCanQueryItsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user5.Name, perm.AccessModeRead))
|
||||
t.Run("CollaboratorCanReadOwnPermission", func(t *testing.T) {
|
||||
session := loginUser(t, user5.Name)
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
|
||||
|
||||
_session := loginUser(t, user5.Name)
|
||||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name).AddTokenAuth(token)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
repoCollPerm := api.RepoCollaboratorPermission{}
|
||||
DecodeJSON(t, resp, &repoCollPerm)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("RepoAdminCanQueryACollaboratorsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithAdminAccess", doAPIAddCollaborator(testCtx, user10.Name, perm.AccessModeAdmin))
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user11.Name, perm.AccessModeRead))
|
||||
|
||||
_session := loginUser(t, user10.Name)
|
||||
_testCtx := NewAPITestContext(t, user10.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user11.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
assert.Equal(t, "read", repoCollPerm.Permission)
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("CollaboratorCanQueryItsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user5.Name, perm.AccessModeRead))
|
||||
|
||||
_session := loginUser(t, user5.Name)
|
||||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
|
||||
t.Run("RepoAdminCanQueryACollaboratorsPermissions", func(t *testing.T) {
|
||||
t.Run("AddUserAsCollaboratorWithAdminAccess", doAPIAddCollaborator(testCtx, user10.Name, perm.AccessModeAdmin))
|
||||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user11.Name, perm.AccessModeRead))
|
||||
|
||||
_session := loginUser(t, user10.Name)
|
||||
_testCtx := NewAPITestContext(t, user10.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository)
|
||||
|
||||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user11.Name).
|
||||
AddTokenAuth(_testCtx.Token)
|
||||
resp := _session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var repoPermission api.RepoCollaboratorPermission
|
||||
DecodeJSON(t, resp, &repoPermission)
|
||||
|
||||
assert.Equal(t, "read", repoPermission.Permission)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user