Merge pull request #168 from aspnetboilerplate/maliming/patch-4

Use GrantedPermissions instead of Permissions in Role.

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Linq;
+using System.Reflection;
 using Abp.Authorization;
 using Abp.Authorization.Roles;
 using Abp.Authorization.Users;
@@ -30,9 +31,11 @@ public override void Initialize()
                 cfg.CreateMap<Permission, string>().ConvertUsing(r => r.Name);
                 cfg.CreateMap<RolePermissionSetting, string>().ConvertUsing(r => r.Name);
 
-                cfg.CreateMap<CreateRoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
-                cfg.CreateMap<RoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
-                
+                cfg.CreateMap<CreateRoleDto, Role>();
+                cfg.CreateMap<RoleDto, Role>();
+                cfg.CreateMap<Role, RoleDto>().ForMember(x => x.GrantedPermissions,
+                    opt => opt.MapFrom(x => x.Permissions.Where(p => p.IsGranted)));
+
                 cfg.CreateMap<UserDto, User>();
                 cfg.CreateMap<UserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
 

src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/CreateRoleDto.cs

@@ -1,12 +1,10 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Abp.Authorization.Roles;
-using Abp.AutoMapper;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Roles.Dto
 {
-    [AutoMapTo(typeof(Role))]
     public class CreateRoleDto
     {
         [Required]
@@ -24,6 +22,6 @@ public class CreateRoleDto
 
         public bool IsStatic { get; set; }
 
-        public List<string> Permissions { get; set; }
+        public List<string> GrantedPermissions { get; set; }
     }
 }

src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleDto.cs

@@ -2,12 +2,10 @@
 using System.ComponentModel.DataAnnotations;
 using Abp.Application.Services.Dto;
 using Abp.Authorization.Roles;
-using Abp.AutoMapper;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Roles.Dto
 {
-    [AutoMapFrom(typeof(Role)), AutoMapTo(typeof(Role))]
     public class RoleDto : EntityDto<int>
     {
         [Required]
@@ -23,6 +21,6 @@ public class RoleDto : EntityDto<int>
 
         public bool IsStatic { get; set; }
 
-        public List<string> Permissions { get; set; }
+        public List<string> GrantedPermissions { get; set; }
     }
 }

src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

@@ -53,7 +53,7 @@ public override async Task<RoleDto> Create(CreateRoleDto input)
 
             var grantedPermissions = PermissionManager
                 .GetAllPermissions()
-                .Where(p => input.Permissions.Contains(p.Name))
+                .Where(p => input.GrantedPermissions.Contains(p.Name))
                 .ToList();
 
             await _roleManager.SetGrantedPermissionsAsync(role, grantedPermissions);
@@ -73,7 +73,7 @@ public override async Task<RoleDto> Update(RoleDto input)
 
             var grantedPermissions = PermissionManager
                 .GetAllPermissions()
-                .Where(p => input.Permissions.Contains(p.Name))
+                .Where(p => input.GrantedPermissions.Contains(p.Name))
                 .ToList();
 
             await _roleManager.SetGrantedPermissionsAsync(role, grantedPermissions);

src/AbpCompanyName.AbpProjectName.WebMpa/Models/Roles/EditRoleModalViewModel.cs

@@ -12,7 +12,7 @@ public class EditRoleModalViewModel
 
         public bool HasPermission(PermissionDto permission)
         {
-            return Permissions != null && Role.Permissions.Any(p => p == permission.Name);
+            return Permissions != null && Role.GrantedPermissions.Any(p => p == permission.Name);
         }
     }
 }

src/AbpCompanyName.AbpProjectName.WebMpa/Views/Roles/Index.js

@@ -42,12 +42,12 @@
             }
 
             var role = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js
-            role.permissions = [];
+            role.grantedPermissions = [];
             var _$permissionCheckboxes = $("input[name='permission']:checked:visible");
             if (_$permissionCheckboxes) {
                 for (var permissionIndex = 0; permissionIndex < _$permissionCheckboxes.length; permissionIndex++) {
                     var _$permissionCheckbox = $(_$permissionCheckboxes[permissionIndex]);
-                    role.permissions.push(_$permissionCheckbox.val());
+                    role.grantedPermissions.push(_$permissionCheckbox.val());
                 }
             }
 

src/AbpCompanyName.AbpProjectName.WebMpa/Views/Roles/_EditRoleModal.js

@@ -11,12 +11,12 @@
         }
 
         var role = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js
-        role.permissions = [];
+        role.grantedPermissions = [];
         var _$permissionCheckboxes = $("input[name='permission']:checked:visible");
         if (_$permissionCheckboxes) {
             for (var permissionIndex = 0; permissionIndex < _$permissionCheckboxes.length; permissionIndex++) {
                 var _$permissionCheckbox = $(_$permissionCheckboxes[permissionIndex]);
-                role.permissions.push(_$permissionCheckbox.val());
+                role.grantedPermissions.push(_$permissionCheckbox.val());
             }
         }
 

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/roles/createModal.js

@@ -25,7 +25,7 @@
                     assignedPermissions.push(permission.name);
                 }
 
-                vm.role.permissions = assignedPermissions;
+                vm.role.grantedPermissions = assignedPermissions;
                 roleService.create(vm.role)
                     .then(function () {
                         abp.notify.info(App.localize('SavedSuccessfully'));

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/roles/editModal.js

@@ -10,7 +10,7 @@
             var setAssignedPermissions = function (role, permissions) {
                 for (var i = 0; i < permissions.length; i++) {
                     var permission = permissions[i];
-                    permission.isAssigned = $.inArray(permission.name, role.permissions) >= 0;
+                    permission.isAssigned = $.inArray(permission.name, role.grantedPermissions) >= 0;
                 }
             }
 
@@ -39,7 +39,7 @@
                     assignedPermissions.push(permission.name);
                 }
 
-                vm.role.permissions = assignedPermissions;
+                vm.role.grantedPermissions = assignedPermissions;
                 roleService.update(vm.role)
                     .then(function () {
                         abp.notify.info(App.localize('SavedSuccessfully'));