Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix roles filter #14468

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Fix roles filter #14468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37237a3
Fix roles filter
MikeAlhayek Oct 9, 2023
73b5ef3
cleanup
MikeAlhayek Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions src/OrchardCore.Modules/OrchardCore.Users/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ public AdminController(
public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(UserFilterEngineModelBinder), Name = "q")] QueryFilterResult<User> queryFilterResult, PagerParameters pagerParameters)
{
// Check a dummy user account to see if the current user has permission to view users.
var authUser = new User();

if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, authUser))
if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, new User()))
{
return Forbid();
}
Expand Down Expand Up @@ -144,17 +142,17 @@ public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(UserFilte
new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
//new SelectListItem() { Text = S["Approved"], Value = nameof(UsersFilter.Approved) },
//new SelectListItem() { Text = S["Email pending"], Value = nameof(UsersFilter.EmailPending) },
//new SelectListItem() { Text = S["Pending"], Value = nameof(UsersFilter.Pending) }
// new SelectListItem() { Text = S["Approved"], Value = nameof(UsersFilter.Approved) },
// new SelectListItem() { Text = S["Email pending"], Value = nameof(UsersFilter.EmailPending) },
// new SelectListItem() { Text = S["Pending"], Value = nameof(UsersFilter.Pending) }
};

options.UserSorts = new List<SelectListItem>()
{
new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
//new SelectListItem() { Text = S["Created date"], Value = nameof(UsersOrder.CreatedUtc) },
//new SelectListItem() { Text = S["Last Login date"], Value = nameof(UsersOrder.LastLoginUtc) }
// new SelectListItem() { Text = S["Created date"], Value = nameof(UsersOrder.CreatedUtc) },
// new SelectListItem() { Text = S["Last Login date"], Value = nameof(UsersOrder.LastLoginUtc) }
};

options.UsersBulkAction = new List<SelectListItem>()
Expand All @@ -165,17 +163,36 @@ public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(UserFilte
new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
};

var allRoles = (await _roleService.GetRoleNamesAsync())
.Except(RoleHelper.SystemRoleNames, StringComparer.OrdinalIgnoreCase);
var roleNames = new List<string>();

foreach (var roleName in await _roleService.GetRoleNamesAsync())
{
var permission = CommonPermissions.CreateListUsersInRolePermission(roleName);

if (!await _authorizationService.AuthorizeAsync(User, permission))
{
continue;
}

roleNames.Add(roleName);
}

options.UserRoleFilters = new List<SelectListItem>()
{
new SelectListItem() { Text = S["All roles"], Value = string.Empty, Selected = (options.SelectedRole == string.Empty) },
new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
};

// TODO Candidate for dynamic localization.
options.UserRoleFilters.AddRange(allRoles.Select(x => new SelectListItem { Text = x, Value = x, Selected = string.Equals(options.SelectedRole, x, StringComparison.OrdinalIgnoreCase) }));
options.UserRoleFilters.AddRange(
roleNames.Select(roleName =>
new SelectListItem
{
Text = roleName,
Value = roleName.Contains(' ') ? $"\"{roleName}\"" : roleName,
Selected = string.Equals(options.SelectedRole?.Trim('"'), roleName, StringComparison.OrdinalIgnoreCase)
})
);

// Populate options pager summary values.
var startIndex = (pagerShape.Page - 1) * (pagerShape.PageSize) + 1;
Expand Down