feat: allow to find users with access to a project more freely
continuous-integration/drone/push Build is failing Details

Related to vikunja/frontend#2196
This commit is contained in:
kolaente 2023-04-03 18:49:04 +02:00
parent 327bb3bed9
commit a7231e197e
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
5 changed files with 34 additions and 2 deletions

View File

@ -22,7 +22,7 @@ import (
)
// ILIKE returns an ILIKE query on postgres and a LIKE query on all other platforms.
// Postgres' is case sensitive by default.
// Postgres' is case-sensitive by default.
// To work around this, we're using ILIKE as opposed to normal LIKE statements.
// ILIKE is preferred over LOWER(text) LIKE for performance reasons.
// See https://stackoverflow.com/q/7005302/10924593
@ -31,5 +31,9 @@ func ILIKE(column, search string) builder.Cond {
return builder.Expr(column+" ILIKE ?", "%"+search+"%")
}
if Type() == schemas.SQLITE {
return builder.Expr("username = ? COLLATE NOCASE", "%"+search+"%")
}
return &builder.Like{column, "%" + search + "%"}
}

View File

@ -105,6 +105,7 @@ func ListUsersFromProject(s *xorm.Session, l *Project, search string) (users []*
users, err = user.ListUsers(s, search, &user.ProjectUserOpts{
AdditionalCond: cond,
ReturnAllIfNoSearchProvided: true,
MatchFuzzily: true,
})
return
}

View File

@ -24,7 +24,7 @@ import (
"gopkg.in/d4l3k/messagediff.v1"
)
func TestProjectUsersFromProject(t *testing.T) {
func TestListUsersFromProject(t *testing.T) {
testuser1 := &user.User{
ID: 1,
Username: "user1",
@ -219,6 +219,11 @@ func TestProjectUsersFromProject(t *testing.T) {
args: args{l: &Project{ID: 19, OwnerID: 7}, search: "user1"},
wantUsers: []*user.User{
testuser1, // Shared Via Team readonly
testuser10, // Matches Partially, Shared Via NamespaceTeam admin
testuser11, // Matches Partially, Shared Via NamespaceUser readonly
testuser12, // Matches Partially, Shared Via NamespaceUser write
testuser13, // Matches Partially, Shared Via NamespaceUser admin
},
},
}

View File

@ -503,6 +503,17 @@ func TestProjectUsers(t *testing.T) {
"username": "user7",
}, false)
})
t.Run("discoverable by partial username, email and name when matching fuzzily", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
all, err := ListUsers(s, "user", &ProjectUserOpts{
MatchFuzzily: true,
})
assert.NoError(t, err)
assert.Len(t, all, 15)
})
}
func TestUserPasswordReset(t *testing.T) {

View File

@ -29,6 +29,7 @@ import (
type ProjectUserOpts struct {
AdditionalCond builder.Cond
ReturnAllIfNoSearchProvided bool
MatchFuzzily bool
}
// ListUsers returns a project with all users, filtered by an optional search string
@ -48,6 +49,16 @@ func ListUsers(s *xorm.Session, search string, opts *ProjectUserOpts) (users []*
if search != "" {
for _, queryPart := range strings.Split(search, ",") {
if opts.MatchFuzzily {
conds = append(conds,
db.ILIKE("name", queryPart),
db.ILIKE("username", queryPart),
db.ILIKE("email", queryPart),
)
continue
}
var usernameCond builder.Cond = builder.Eq{"username": queryPart}
if db.Type() == schemas.POSTGRES {
usernameCond = builder.Expr("username ILIKE ?", queryPart)