fix(docs): document pnpm instead of yarn

Reviewed-At: https://github.com/go-vikunja/api/pull/47

CHANGELOG.md

@@ -7,6 +7,46 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 All releases can be found on https://code.vikunja.io/api/releases.
 
+## [0.19.2] - 2022-08-17
+
+### Bug Fixes
+
+* Don't fail a migration if there is no filter saved ([10ded56](10ded56f6697ef47910ec68d37f26ed47cbe9180))
+* Don't override saved filters ([beb4d07](beb4d07cf95fc25f7cc5f7471b46bdab49f95fe0))
+
+## [0.19.1] - 2022-08-17
+
+### Bug Fixes
+
+* Prevent moving a list into a pseudo namespace ([3ccc636](3ccc6365a6892f37ee54b0750a34a61e52f6dba1))
+* Make sure generating blur hashes for bmp, tiff and webp images works ([8bf0f8b](8bf0f8bb571ddff69a7142be1acaa2e4e0c38e3b))
+* Add debian-based docker image for arm 32 builds ([c9e044b](c9e044b3ad60d25e9641d22d84571a7db83a26ac))
+* Only list all users when allowed ([9ddd7f4](9ddd7f48895f508539d591aeebde450a86987024))
+* Lint ([0c8bed4](0c8bed4054649de8510e5a636d1a14b65d52c402))
+
+### Dependencies
+
+* *(deps)* Update golang.org/x/sys digest to 6e608f9 (#1229)
+* *(deps)* Update golang.org/x/sync digest to 886fb93 (#1221)
+* *(deps)* Update golang.org/x/sys digest to 8e32c04 (#1230)
+* *(deps)* Update golang.org/x/term digest to a9ba230 (#1222)
+* *(deps)* Update module github.com/prometheus/client_golang to v1.13.0
+* *(deps)* Update module github.com/prometheus/client_golang to v1.13.0 (#1231)
+* *(deps)* Update golang.org/x/sys digest to 1c4a2a7
+* *(deps)* Update golang.org/x/oauth2 digest to 128564f (#1220)
+* *(deps)* Update golang.org/x/image digest to 062f8c9 (#1219)
+* *(deps)* Update golang.org/x/crypto digest to 630584e (#1218)
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.8.0 (#1233)
+* *(deps)* Update golang.org/x/sys digest to fbc7d0a (#1234)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.2.6 (#1235)
+* *(deps)* Update module github.com/mattn/go-sqlite3 to v1.14.15 (#1238)
+
+### Features
+
+* *(docs)* Add k8s docs* Add openid examples ([dbb0f54](dbb0f5473269fb29c4a484cd233a5b76484c4ca7))
+* Search by assignee username instead of id ([7f28865](7f28865903740d6dde15ee005323fbdee3072166))
+* Add migration to change user ids to usernames in saved filters ([3047ccf](3047ccfd4af8fee55d9ebff49138911ab80cb3d2))
+
 ## [0.19.0] - 2022-08-03
 
 ### Bug Fixes

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://drone.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone.kolaente.de/vikunja/api)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.19.0-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.19.2-brightgreen.svg)](https://dl.vikunja.io)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
 [![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/api)](https://goreportcard.com/report/kolaente.dev/vikunja/api)
@@ -56,6 +56,10 @@ See [the roadmap](https://my.vikunja.cloud/share/QFyzYEmEYfSyQfTOmIRSwLUpkFjboaB
 
 Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more info.
 
+## Sponsors
+
+[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)
+
 ## License
 
 This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text.

config.yml.sample

@@ -127,7 +127,8 @@ mailer:
   enabled: false
   # SMTP Host
   host: ""
-  # SMTP Host port
+  # SMTP Host port.
+  # **NOTE:** If you're unable to send mail and the only error you see in the logs is an `EOF`, try setting the port to `25`.
   port: 587
   # SMTP Auth Type. Can be either `plain`, `login` or `cram-md5`.
   authtype: "plain"

docs/content/doc/development/development.md

@@ -36,8 +36,9 @@ Make sure to check the other doc articles for specific development tasks like [t
 ## Frontend requirements
 
 The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
+More instructions can be found in the repo's README.
 
-You need to have yarn v1 and nodejs in version 16 installed.
+You need to have [pnpm](https://pnpm.io/) and nodejs in version 16 or 18 installed.
 
 ## Git flow
 

docs/content/doc/development/test.md

@@ -98,12 +98,12 @@ Check out the docs [in the frontend repo](https://kolaente.dev/vikunja/frontend/
 To run the frontend unit tests, run
 
 {{< highlight bash >}}
-yarn test:unit
+pnpm test:unit
 {{< /highlight >}}
 
 The frontend also has a watcher available that re-runs all unit tests every time you change something.
 To use it, simply run
 
 {{< highlight bash >}}
-yarn test:unit-watch
+pnpm test:unit-watch
 {{< /highlight >}}

docs/content/doc/setup/build-from-source.md

@@ -38,9 +38,7 @@ More options are available, please refer to the [magefile docs]({{< ref "../deve
 
 The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
 
-You need to have yarn v1 and nodejs in version 16 installed.
-
-1. Make sure [yarn v1](https://yarnpkg.com/getting-started/install) is properly installed on your system.
-3. Clone the repo with `git clone https://code.vikunja.io/frontend` and switch into the directory.
-3. Install all dependencies with `yarn install`
-4. Build the frontend with `yarn build`. This will result in a js bundle in the `dist/` folder which you can deploy.
+1. Make sure you have [pnpm](https://pnpm.io/) properly installed on your system.
+2. Clone the repo with `git clone https://code.vikunja.io/frontend` and switch into the directory.
+3. Install all dependencies with `pnpm install`
+4. Build the frontend with `pnpm build`. This will result in a static js bundle in the `dist/` folder which you can deploy.

docs/content/doc/setup/config.md

@@ -657,7 +657,8 @@ Environment path: `VIKUNJA_MAILER_HOST`
 
 ### port
 
-SMTP Host port
+SMTP Host port.
+**NOTE:** If you're unable to send mail and the only error you see in the logs is an `EOF`, try setting the port to `25`.
 
 Default: `587`
 

docs/content/doc/setup/subdirectory.md

@@ -0,0 +1,39 @@
+---
+title: "Running Vikunja in a subdirectory"
+date: 2022-09-23T12:15:04+02:00
+draft: false
+menu:
+  sidebar:
+    parent: "setup"
+---
+
+# Running Vikunja in a subdirectory
+
+Running Vikunja in a subdirectory is not supported out of the box.
+However, you can still run it in a subdirectory but need to build the frontend yourself.
+
+## Frontend
+
+First, make sure you're able to build the frontend from source.
+Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that.
+
+Then, run 
+
+```
+pnpm vite build --base=/SUBPATH
+pnpm workbox copyLibraries dist/
+```
+
+Where `SUBPATH` is the subdirectory you want to run Vikunja on.
+
+Once you have the build files you can deploy them as usual.
+Note that when deploying in docker you'll need to put the files in a web container yourself, you 
+can't use the `Dockerfile` in the repo without modifications.
+
+## API
+
+If you're not using a reverse proxy you're good to go.
+Simply configure the api url in the frontend as you normally would.
+
+If you're using a reverse proxy you'll need to adjust the paths so that the api is available at `/SUBPATH/api/v1`.
+You can check if everything is working correctly by opening `/SUBPATH/api/v1/info` in a browser.

go.mod

@@ -45,7 +45,7 @@ require (
 	github.com/labstack/gommon v0.3.1
 	github.com/lib/pq v1.10.6
 	github.com/magefile/mage v1.13.0
-	github.com/mattn/go-sqlite3 v1.14.14
+	github.com/mattn/go-sqlite3 v1.14.15
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pquerna/otp v1.3.0

go.sum

@@ -592,6 +592,8 @@ github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/mattn/go-sqlite3 v1.14.13/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

magefile.go

@@ -559,7 +559,9 @@ func (Release) Compress(ctx context.Context) error {
 			return nil
 		}
 		// No mips or s390x for you today
-		if strings.Contains(info.Name(), "mips") || strings.Contains(info.Name(), "s390x") {
+		if strings.Contains(info.Name(), "mips") ||
+			strings.Contains(info.Name(), "s390x") ||
+			strings.Contains(info.Name(), "riscv64") { // not supported by upx
 			return nil
 		}
 

pkg/caldav/caldav.go

@@ -181,6 +181,10 @@ SUMMARY:` + t.Summary + getCaldavColor(t.Color)
 		if t.Start.Unix() > 0 {
 			caldavtodos += `
 DTSTART:` + makeCalDavTimeFromTimeStamp(t.Start)
+			if t.Duration != 0 && t.DueDate.Unix() == 0 {
+				caldavtodos += `
+DURATION:PT` + formatDuration(t.Duration)
+			}
 		}
 		if t.End.Unix() > 0 {
 			caldavtodos += `
@@ -217,11 +221,6 @@ DUE:` + makeCalDavTimeFromTimeStamp(t.DueDate)
 CREATED:` + makeCalDavTimeFromTimeStamp(t.Created)
 		}
 
-		if t.Duration != 0 {
-			caldavtodos += `
-DURATION:PT` + formatDuration(t.Duration)
-		}
-
 		if t.Priority != 0 {
 			caldavtodos += `
 PRIORITY:` + strconv.Itoa(mapPriorityToCaldav(t.Priority))

pkg/mail/mail.go

@@ -105,14 +105,14 @@ func StartMailDaemon() {
 				if !open {
 					err = c.DialWithContext(context.Background())
 					if err != nil {
-						log.Error("Error during connect to smtp server: %s", err)
+						log.Errorf("Error during connect to smtp server: %s", err)
 						break
 					}
 					open = true
 				}
 				err = c.Send(m)
 				if err != nil {
-					log.Error("Error when sending mail: %s", err)
+					log.Errorf("Error when sending mail: %s", err)
 					break
 				}
 				// Close the connection to the SMTP server if no email was sent in
@@ -122,10 +122,10 @@ func StartMailDaemon() {
 					open = false
 					err = c.Close()
 					if err != nil {
-						log.Error("Error closing the mail server connection: %s\n", err)
+						log.Errorf("Error closing the mail server connection: %s\n", err)
 						break
 					}
-					log.Infof("Closed connection to mail server")
+					log.Info("Closed connection to mail server")
 				}
 			}
 		}

pkg/migration/20220815200851.go

@@ -0,0 +1,108 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"encoding/json"
+	"strconv"
+	"strings"
+
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20220815200851",
+		Description: "Migrate saved assignee filter to usernames instead of IDs",
+		Migrate: func(tx *xorm.Engine) error {
+			filters := []map[string]interface{}{} // not using the type here so that the migration does not depend on it
+			err := tx.Select("*").
+				Table("saved_filters").
+				Find(&filters)
+			if err != nil {
+				return err
+			}
+
+			for _, f := range filters {
+				filter := map[string]interface{}{}
+				filterJSON, is := f["filters"].(string)
+				if !is {
+					continue
+				}
+				err = json.Unmarshal([]byte(filterJSON), &filter)
+				if err != nil {
+					return err
+				}
+				filterBy := filter["filter_by"].([]interface{})
+				filterValue := filter["filter_value"].([]interface{})
+				for p, fb := range filterBy {
+					if fb == "assignees" || fb == "user_id" {
+						userIDs := []int64{}
+						for _, sid := range strings.Split(filterValue[p].(string), ",") {
+							id, err := strconv.ParseInt(sid, 10, 64)
+							if err != nil {
+								return err
+							}
+							userIDs = append(userIDs, id)
+						}
+
+						usernames := []string{}
+						err := tx.Select("username").
+							Table("users").
+							In("id", userIDs).
+							Find(&usernames)
+						if err != nil {
+							return err
+						}
+
+						userfilter := ""
+						for i, username := range usernames {
+							if i > 0 {
+								userfilter += ","
+							}
+							userfilter += username
+						}
+						filterValue[p] = userfilter
+					}
+				}
+
+				filter["filter_value"] = filterValue
+				filtersJSON, err := json.Marshal(filter)
+				if err != nil {
+					return err
+				}
+
+				f["filters"] = string(filtersJSON)
+
+				_, err = tx.Where("id = ?", f["id"]).
+					Cols("filters").
+					NoAutoCondition().
+					Table("saved_filters").
+					Update(f)
+				if err != nil {
+					return err
+				}
+			}
+
+			return nil
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}

pkg/models/task_collection_filter.go

@@ -214,6 +214,12 @@ func getNativeValueForTaskField(fieldName string, comparator taskFilterComparato
 		return
 	}
 
+	if realFieldName == "Assignees" {
+		vals := strings.Split(value, ",")
+		valueSlice := append([]string{}, vals...)
+		return valueSlice, nil
+	}
+
 	field, ok := reflect.TypeOf(&Task{}).Elem().FieldByName(realFieldName)
 	if !ok {
 		return nil, ErrInvalidTaskField{TaskField: fieldName}

pkg/models/task_collection_test.go

@@ -934,10 +934,10 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "filter assignees",
+			name: "filter assignees by username",
 			fields: fields{
 				FilterBy:         []string{"assignees"},
-				FilterValue:      []string{"1"},
+				FilterValue:      []string{"user1"},
 				FilterComparator: []string{"equals"},
 			},
 			args: defaultArgs,
@@ -947,12 +947,80 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "filter assignees in",
+			name: "filter assignees by username with users field name",
+			fields: fields{
+				FilterBy:         []string{"users"},
+				FilterValue:      []string{"user1"},
+				FilterComparator: []string{"equals"},
+			},
+			args:    defaultArgs,
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "filter assignees by username with user_id field name",
+			fields: fields{
+				FilterBy:         []string{"user_id"},
+				FilterValue:      []string{"user1"},
+				FilterComparator: []string{"equals"},
+			},
+			args:    defaultArgs,
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "filter assignees by multiple username",
+			fields: fields{
+				FilterBy:         []string{"assignees", "assignees"},
+				FilterValue:      []string{"user1", "user2"},
+				FilterComparator: []string{"equals", "equals"},
+			},
+			args: defaultArgs,
+			want: []*Task{
+				task30,
+			},
+			wantErr: false,
+		},
+		{
+			name: "filter assignees by numbers",
+			fields: fields{
+				FilterBy:         []string{"assignees"},
+				FilterValue:      []string{"1"},
+				FilterComparator: []string{"equals"},
+			},
+			args:    defaultArgs,
+			want:    []*Task{},
+			wantErr: false,
+		},
+		{
+			name: "filter assignees by name with like",
+			fields: fields{
+				FilterBy:         []string{"assignees"},
+				FilterValue:      []string{"user"},
+				FilterComparator: []string{"like"},
+			},
+			args:    defaultArgs,
+			want:    []*Task{},
+			wantErr: true,
+		},
+		{
+			name: "filter assignees in by id",
 			fields: fields{
 				FilterBy:         []string{"assignees"},
 				FilterValue:      []string{"1,2"},
 				FilterComparator: []string{"in"},
 			},
+			args:    defaultArgs,
+			want:    []*Task{},
+			wantErr: false,
+		},
+		{
+			name: "filter assignees in by username",
+			fields: fields{
+				FilterBy:         []string{"assignees"},
+				FilterValue:      []string{"user1,user2"},
+				FilterComparator: []string{"in"},
+			},
 			args: defaultArgs,
 			want: []*Task{
 				task30,

pkg/models/tasks.go

@@ -338,8 +338,11 @@ func getRawTasksForLists(s *xorm.Session, lists []*List, a web.Auth, opts *taskO
 			continue
 		}
 
-		if f.field == "assignees" || f.field == "user_id" {
-			f.field = "user_id"
+		if f.field == "assignees" {
+			if f.comparator == taskFilterComparatorLike {
+				return nil, 0, 0, ErrInvalidTaskFilterValue{Field: f.field, Value: f.value}
+			}
+			f.field = "username"
 			filter, err := getFilterCond(f, opts.filterIncludeNulls)
 			if err != nil {
 				return nil, 0, 0, err
@@ -430,7 +433,13 @@ func getRawTasksForLists(s *xorm.Session, lists []*List, a web.Auth, opts *taskO
 	}
 
 	if len(assigneeFilters) > 0 {
-		filters = append(filters, getFilterCondForSeparateTable("task_assignees", opts.filterConcat, assigneeFilters))
+		assigneeFilter := []builder.Cond{
+			builder.In("user_id",
+				builder.Select("id").
+					From("users").
+					Where(builder.Or(assigneeFilters...)),
+			)}
+		filters = append(filters, getFilterCondForSeparateTable("task_assignees", opts.filterConcat, assigneeFilter))
 	}
 
 	if len(labelFilters) > 0 {
@@ -1280,18 +1289,39 @@ func setTaskDatesFromCurrentDateRepeat(oldTask, newTask *Task) {
 		}
 	}
 
-	// If a task has a start and end date, the end date should keep the difference to the start date when setting them as new
-	if !oldTask.StartDate.IsZero() && !oldTask.EndDate.IsZero() {
-		diff := oldTask.EndDate.Sub(oldTask.StartDate)
-		newTask.StartDate = now.Add(repeatDuration)
-		newTask.EndDate = now.Add(repeatDuration + diff)
-	} else {
-		if !oldTask.StartDate.IsZero() {
+	// We want to preserve intervals among the due, start and end dates.
+	// The due date is used as a reference point for all new dates, so the
+	// behaviour depends on whether the due date is set at all.
+	if oldTask.DueDate.IsZero() {
+		// If a task has no due date, but does have a start and end date, the
+		// end date should keep the difference to the start date when setting
+		// them as new
+		if !oldTask.StartDate.IsZero() && !oldTask.EndDate.IsZero() {
+			diff := oldTask.EndDate.Sub(oldTask.StartDate)
 			newTask.StartDate = now.Add(repeatDuration)
+			newTask.EndDate = now.Add(repeatDuration + diff)
+		} else {
+			if !oldTask.StartDate.IsZero() {
+				newTask.StartDate = now.Add(repeatDuration)
+			}
+
+			if !oldTask.EndDate.IsZero() {
+				newTask.EndDate = now.Add(repeatDuration)
+			}
+		}
+	} else {
+		// If the old task has a start and due date, we set the new start date
+		// to preserve the interval between them.
+		if !oldTask.StartDate.IsZero() {
+			diff := oldTask.DueDate.Sub(oldTask.StartDate)
+			newTask.StartDate = newTask.DueDate.Add(-diff)
 		}
 
+		// If the old task has an end and due date, we set the new end date
+		// to preserve the interval between them.
 		if !oldTask.EndDate.IsZero() {
-			newTask.EndDate = now.Add(repeatDuration)
+			diff := oldTask.DueDate.Sub(oldTask.EndDate)
+			newTask.EndDate = newTask.DueDate.Add(-diff)
 		}
 	}
 

pkg/models/users_list_test.go

@@ -214,6 +214,13 @@ func TestListUsersFromList(t *testing.T) {
 				testuser13, // Shared Via NamespaceUser admin
 			},
 		},
+		{
+			name: "search for user1",
+			args: args{l: &List{ID: 19, OwnerID: 7}, search: "user1"},
+			wantUsers: []*user.User{
+				testuser1, // Shared Via Team readonly
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/user/user_test.go

@@ -455,6 +455,31 @@ func TestListUsers(t *testing.T) {
 			"discoverable_by_email": true,
 		}, false)
 	})
+	t.Run("discoverable by exact username", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		s := db.NewSession()
+		defer s.Close()
+
+		all, err := ListUsers(s, "user7", nil)
+		assert.NoError(t, err)
+		assert.Len(t, all, 1)
+		assert.Equal(t, int64(7), all[0].ID)
+		db.AssertExists(t, "users", map[string]interface{}{
+			"username": "user7",
+		}, false)
+	})
+	t.Run("not discoverable by partial username", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		s := db.NewSession()
+		defer s.Close()
+
+		all, err := ListUsers(s, "user", nil)
+		assert.NoError(t, err)
+		assert.Len(t, all, 0)
+		db.AssertExists(t, "users", map[string]interface{}{
+			"username": "user7",
+		}, false)
+	})
 }
 
 func TestUserPasswordReset(t *testing.T) {

pkg/user/users_list.go

@@ -41,17 +41,25 @@ func ListUsers(s *xorm.Session, search string, opts *ListUserOpts) (users []*Use
 		return
 	}
 
-	cond := builder.Or(
-		builder.Like{"username", "%" + search + "%"},
-		builder.And(
-			builder.Eq{"email": search},
-			builder.Eq{"discoverable_by_email": true},
-		),
-		builder.And(
-			builder.Like{"name", "%" + search + "%"},
-			builder.Eq{"discoverable_by_name": true},
-		),
-	)
+	conds := []builder.Cond{}
+
+	if search != "" {
+		for _, queryPart := range strings.Split(search, ",") {
+			conds = append(conds,
+				builder.Eq{"username": queryPart},
+				builder.And(
+					builder.Eq{"email": queryPart},
+					builder.Eq{"discoverable_by_email": true},
+				),
+				builder.And(
+					builder.Like{"name", "%" + queryPart + "%"},
+					builder.Eq{"discoverable_by_name": true},
+				),
+			)
+		}
+	}
+
+	cond := builder.Or(conds...)
 
 	if opts.AdditionalCond != nil {
 		cond = builder.And(