IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle app errors in user autocomplete endpoint (#8643)

Browse Source
This commit is contained in:
Joram Wilander
2018-04-17 18:39:08 -04:00
committed by Christopher Speller
parent 51a6e95f58
commit b15f69ea30
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api4/user.go
View File

@@ -508,7 +508,12 @@ func autocompleteUsers(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
result, _ := c.App.AutocompleteUsersInChannel(teamId, channelId, name, searchOptions, c.IsSystemAdmin())
result, err := c.App.AutocompleteUsersInChannel(teamId, channelId, name, searchOptions, c.IsSystemAdmin())
if err != nil {
c.Err = err
return
}
autocomplete.Users = result.InChannel
autocomplete.OutOfChannel = result.OutOfChannel
} else if len(teamId) > 0 {
@@ -517,11 +522,20 @@ func autocompleteUsers(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
result, _ := c.App.AutocompleteUsersInTeam(teamId, name, searchOptions, c.IsSystemAdmin())
result, err := c.App.AutocompleteUsersInTeam(teamId, name, searchOptions, c.IsSystemAdmin())
if err != nil {
c.Err = err
return
}
autocomplete.Users = result.InTeam
} else {
// No permission check required
result, _ := c.App.SearchUsersInTeam("", name, searchOptions, c.IsSystemAdmin())
result, err := c.App.SearchUsersInTeam("", name, searchOptions, c.IsSystemAdmin())
if err != nil {
c.Err = err
return
}
autocomplete.Users = result
}