Merge pull request #334 from aspnetboilerplate/role-app-service

Fixed #322 - RoleAppService.Get returns Prohibited permissions which …

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/GetRolesInput.cs

@@ -0,0 +1,7 @@
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class GetRolesInput
+    {
+        public string Permission { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleListDto.cs

@@ -0,0 +1,19 @@
+using System;
+using Abp.Application.Services.Dto;
+using Abp.Domain.Entities.Auditing;
+
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class RoleListDto : EntityDto, IHasCreationTime
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public bool IsStatic { get; set; }
+
+        public bool IsDefault { get; set; }
+
+        public DateTime CreationTime { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/IRoleAppService.cs

@@ -10,5 +10,7 @@ public interface IRoleAppService : IAsyncCrudAppService<RoleDto, int, PagedResul
         Task<ListResultDto<PermissionDto>> GetAllPermissions();
 
         Task<GetRoleForEditOutput> GetRoleForEdit(EntityDto input);
+
+        Task<ListResultDto<RoleListDto>> GetRolesAsync(GetRolesInput input);
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

@@ -8,7 +8,8 @@
 using Abp.Authorization;
 using Abp.Domain.Repositories;
 using Abp.IdentityFramework;
-using Abp.UI;
+using Abp.Linq.Extensions;
+using Abp.Extensions;
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
@@ -48,6 +49,19 @@ public override async Task<RoleDto> Create(CreateRoleDto input)
             return MapToEntityDto(role);
         }
 
+        public async Task<ListResultDto<RoleListDto>> GetRolesAsync(GetRolesInput input)
+        {
+            var roles = await _roleManager
+                .Roles
+                .WhereIf(
+                    !input.Permission.IsNullOrWhiteSpace(),
+                    r => r.Permissions.Any(rp => rp.Name == input.Permission && rp.IsGranted)
+                )
+                .ToListAsync();
+
+            return new ListResultDto<RoleListDto>(ObjectMapper.Map<List<RoleListDto>>(roles));
+        }
+
         public override async Task<RoleDto> Update(RoleDto input)
         {
             CheckUpdatePermission();

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/RolesController.cs

@@ -5,6 +5,7 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
 using AbpCompanyName.AbpProjectName.Roles;
+using AbpCompanyName.AbpProjectName.Roles.Dto;
 using AbpCompanyName.AbpProjectName.Web.Models.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
@@ -21,7 +22,7 @@ public RolesController(IRoleAppService roleAppService)
 
         public async Task<IActionResult> Index()
         {
-            var roles = (await _roleAppService.GetAll(new PagedAndSortedResultRequestDto())).Items;
+            var roles = (await _roleAppService.GetRolesAsync(new GetRolesInput())).Items;
             var permissions = (await _roleAppService.GetAllPermissions()).Items;
             var model = new RoleListViewModel
             {

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Roles/RoleListViewModel.cs

@@ -5,7 +5,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Models.Roles
 {
     public class RoleListViewModel
     {
-        public IReadOnlyList<RoleDto> Roles { get; set; }
+        public IReadOnlyList<RoleListDto> Roles { get; set; }
 
         public IReadOnlyList<PermissionDto> Permissions { get; set; }
     }