22a0636544
You can limit or hide organisations. This pull make it also posible for users - new strings to translte - add checkbox to user profile form - add checkbox to admin user.edit form - filter explore page user search - filter api admin and public user searches - allow admins view "hidden" users - add app option DEFAULT_USER_VISIBILITY - rewrite many files to use Visibility field - check for teams intersection - fix context output - right fake 404 if not visible Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Andrew Thornton <art27@cantab.net>
92 lines
2.7 KiB
Go
92 lines
2.7 KiB
Go
// Copyright 2019 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 models
|
|
|
|
package integrations
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
type SearchResults struct {
|
|
OK bool `json:"ok"`
|
|
Data []*api.User `json:"data"`
|
|
}
|
|
|
|
func TestAPIUserSearchLoggedIn(t *testing.T) {
|
|
defer prepareTestEnv(t)()
|
|
adminUsername := "user1"
|
|
session := loginUser(t, adminUsername)
|
|
token := getTokenForLoggedInUser(t, session)
|
|
query := "user2"
|
|
req := NewRequestf(t, "GET", "/api/v1/users/search?token=%s&q=%s", token, query)
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
var results SearchResults
|
|
DecodeJSON(t, resp, &results)
|
|
assert.NotEmpty(t, results.Data)
|
|
for _, user := range results.Data {
|
|
assert.Contains(t, user.UserName, query)
|
|
assert.NotEmpty(t, user.Email)
|
|
}
|
|
}
|
|
|
|
func TestAPIUserSearchNotLoggedIn(t *testing.T) {
|
|
defer prepareTestEnv(t)()
|
|
query := "user2"
|
|
req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
var results SearchResults
|
|
DecodeJSON(t, resp, &results)
|
|
assert.NotEmpty(t, results.Data)
|
|
var modelUser *models.User
|
|
for _, user := range results.Data {
|
|
assert.Contains(t, user.UserName, query)
|
|
modelUser = models.AssertExistsAndLoadBean(t, &models.User{ID: user.ID}).(*models.User)
|
|
if modelUser.KeepEmailPrivate {
|
|
assert.EqualValues(t, fmt.Sprintf("%s@%s", modelUser.LowerName, setting.Service.NoReplyAddress), user.Email)
|
|
} else {
|
|
assert.EqualValues(t, modelUser.Email, user.Email)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestAPIUserSearchAdminLoggedInUserHidden(t *testing.T) {
|
|
defer prepareTestEnv(t)()
|
|
adminUsername := "user1"
|
|
session := loginUser(t, adminUsername)
|
|
token := getTokenForLoggedInUser(t, session)
|
|
query := "user31"
|
|
req := NewRequestf(t, "GET", "/api/v1/users/search?token=%s&q=%s", token, query)
|
|
req.SetBasicAuth(token, "x-oauth-basic")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
var results SearchResults
|
|
DecodeJSON(t, resp, &results)
|
|
assert.NotEmpty(t, results.Data)
|
|
for _, user := range results.Data {
|
|
assert.Contains(t, user.UserName, query)
|
|
assert.NotEmpty(t, user.Email)
|
|
assert.EqualValues(t, "private", user.Visibility)
|
|
}
|
|
}
|
|
|
|
func TestAPIUserSearchNotLoggedInUserHidden(t *testing.T) {
|
|
defer prepareTestEnv(t)()
|
|
query := "user31"
|
|
req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
var results SearchResults
|
|
DecodeJSON(t, resp, &results)
|
|
assert.Empty(t, results.Data)
|
|
}
|