From 2a753949f10f70de26dba9fbff7c5ef9583d6c86 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 23 Mar 2017 06:34:22 -0400 Subject: Implement POST /users/search endpoint for APIv4 (#5822) * Implement POST /users/search endpoint for APIv4 * PLT-2713 Added store functions for searching users that don't have a team * PLT-2713 Added 'without_team' option when searching users * PLT-2713 Added 'without_team' option when searching users (v4) --- api/user.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'api/user.go') diff --git a/api/user.go b/api/user.go index 24a9025e4..795e83a2a 100644 --- a/api/user.go +++ b/api/user.go @@ -1535,22 +1535,12 @@ func searchUsers(c *Context, w http.ResponseWriter, r *http.Request) { } } - var profiles []*model.User - var err *model.AppError - if props.InChannelId != "" { - profiles, err = app.SearchUsersInChannel(props.InChannelId, props.Term, searchOptions, c.IsSystemAdmin()) - } else if props.NotInChannelId != "" { - profiles, err = app.SearchUsersNotInChannel(props.TeamId, props.NotInChannelId, props.Term, searchOptions, c.IsSystemAdmin()) - } else { - profiles, err = app.SearchUsersInTeam(props.TeamId, props.Term, searchOptions, c.IsSystemAdmin()) - } - - if err != nil { + if profiles, err := app.SearchUsers(props, searchOptions, c.IsSystemAdmin()); err != nil { c.Err = err return + } else { + w.Write([]byte(model.UserListToJson(profiles))) } - - w.Write([]byte(model.UserListToJson(profiles))) } func getProfilesByIds(c *Context, w http.ResponseWriter, r *http.Request) { -- cgit v1.2.3-1-g7c22