Enable user filtering by email and username

api/system/spec.json

@@ -415,6 +415,18 @@
               "name": "query",
               "required": false,
               "title": "Search query to match against users"
+            },
+            {
+              "type": "string",
+              "name": "username",
+              "required": false,
+              "title": "Search username to match against users"
+            },
+            {
+              "type": "string",
+              "name": "email",
+              "required": false,
+              "title": "Search email to match against users"
             }
           ]
         }

api/system/spec/user.json

@@ -29,6 +29,18 @@
             "required": false,
             "title": "Search query to match against users",
             "type": "string"
+          },
+          {
+            "name": "username",
+            "required": false,
+            "title": "Search username to match against users",
+            "type": "string"
+          },
+          {
+            "name": "email",
+            "required": false,
+            "title": "Search email to match against users",
+            "type": "string"
           }
         ]
       }

docs/system/README.md

@@ -305,6 +305,8 @@ An organisation may have many teams. Teams may have many channels available. Acc
 | Parameter | Type | Method | Description | Default | Required? |
 | --------- | ---- | ------ | ----------- | ------- | --------- |
 | query | string | GET | Search query to match against users | N/A | NO |
+| username | string | GET | Search username to match against users | N/A | NO |
+| email | string | GET | Search email to match against users | N/A | NO |
 
 ## Create user
 

system/repository/user.go

@@ -118,6 +118,16 @@ func (r *user) Find(filter *types.UserFilter) ([]*types.User, error) {
 			sql += " OR name LIKE ?)"
 			params = append(params, filter.Query+"%")
 		}
+
+		if filter.Email != "" {
+			sql += " AND (email = ?)"
+			params = append(params, filter.Email)
+		}
+
+		if filter.Username != "" {
+			sql += " AND (username = ?)"
+			params = append(params, filter.Username)
+		}
 	}
 
 	sql += " ORDER BY username ASC"

system/rest/request/user.go

@@ -33,7 +33,9 @@ var _ = multipart.FileHeader{}
 
 // User list request parameters
 type UserList struct {
-	Query string
+	Query    string
+	Username string
+	Email    string
 }
 
 func NewUserList() *UserList {
@@ -71,6 +73,14 @@ func (u *UserList) Fill(r *http.Request) (err error) {
 
 		u.Query = val
 	}
+	if val, ok := get["username"]; ok {
+
+		u.Username = val
+	}
+	if val, ok := get["email"]; ok {
+
+		u.Email = val
+	}
 
 	return err
 }

system/rest/user.go

@@ -26,7 +26,11 @@ func (User) New() *User {
 
 // Searches the users table in the database to find users by matching (by-prefix) their.Username
 func (ctrl *User) List(ctx context.Context, r *request.UserList) (interface{}, error) {
-	return ctrl.user.With(ctx).Find(&types.UserFilter{Query: r.Query})
+	return ctrl.user.With(ctx).Find(&types.UserFilter{
+		Query:    r.Query,
+		Email:    r.Email,
+		Username: r.Username,
+	})
 }
 
 func (ctrl *User) Create(ctx context.Context, r *request.UserCreate) (interface{}, error) {

system/types/user.go

@@ -33,7 +33,9 @@ type (
 	}
 
 	UserFilter struct {
-		Query string
+		Query    string
+		Email    string
+		Username string
 	}
 )