Handle app errors in user autocomplete endpoint (#8643)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
51a6e95f58
Коммит
b15f69ea30
20
api4/user.go
20
api4/user.go
@@ -508,7 +508,12 @@ func autocompleteUsers(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
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.Users = result.InChannel
|
||||||
autocomplete.OutOfChannel = result.OutOfChannel
|
autocomplete.OutOfChannel = result.OutOfChannel
|
||||||
} else if len(teamId) > 0 {
|
} else if len(teamId) > 0 {
|
||||||
@@ -517,11 +522,20 @@ func autocompleteUsers(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
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
|
autocomplete.Users = result.InTeam
|
||||||
} else {
|
} else {
|
||||||
// No permission check required
|
// 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
|
autocomplete.Users = result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user