[MM-26574] Add role filters to get users, users search and add getFilteredUserStats endpoint (#14998)
* MM-26574 Add role filters to user search and get * Add ability to get filtered user stats Add support for include bots * Add tests for user count with filters Add tests * Apply changes from code review * Fix guest filtering * Fix up tests related to guests * Clean role names * Trigger CI * Trigger CI
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c53c9ed190
Коммит
c0bfa58ec1
17
api4/role.go
17
api4/role.go
@@ -5,7 +5,6 @@ package api4
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/audit"
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
@@ -56,18 +55,10 @@ func getRolesByNames(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
var cleanedRoleNames []string
|
||||
for _, rolename := range rolenames {
|
||||
if strings.TrimSpace(rolename) == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
if !model.IsValidRoleName(rolename) {
|
||||
c.SetInvalidParam("rolename")
|
||||
return
|
||||
}
|
||||
|
||||
cleanedRoleNames = append(cleanedRoleNames, rolename)
|
||||
cleanedRoleNames, valid := model.CleanRoleNames(rolenames)
|
||||
if !valid {
|
||||
c.SetInvalidParam("rolename")
|
||||
return
|
||||
}
|
||||
|
||||
roles, err := c.App.GetRolesByNames(cleanedRoleNames)
|
||||
|
||||
Ссылка в новой задаче
Block a user