fix #446 Use GrantedPermissions instead of Permissions in Role.

maliming · maliming · commit 5fa4268a84e2 · 2019-04-23T16:07:26.000+08:00
diff --git a/angular/src/app/roles/create-role/create-role-dialog.component.ts b/angular/src/app/roles/create-role/create-role-dialog.component.ts
@@ -81,7 +81,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
   save(): void {
     this.saving = true;
 
-    this.role.permissions = this.getCheckedPermissions();
+    this.role.grantedPermissions = this.getCheckedPermissions();
 
     const role_ = new CreateRoleDto();
     role_.init(this.role);
diff --git a/angular/src/app/roles/edit-role/edit-role-dialog.component.ts b/angular/src/app/roles/edit-role/edit-role-dialog.component.ts
@@ -88,7 +88,7 @@ export class EditRoleDialogComponent extends AppComponentBase
   save(): void {
     this.saving = true;
 
-    this.role.permissions = this.getCheckedPermissions();
+    this.role.grantedPermissions = this.getCheckedPermissions();
 
     this._roleService
       .update(this.role)
diff --git a/angular/src/shared/service-proxies/service-proxies.ts b/angular/src/shared/service-proxies/service-proxies.ts
@@ -1933,8 +1933,7 @@ export class CreateRoleDto implements ICreateRoleDto {
     displayName: string;
     normalizedName: string | undefined;
     description: string | undefined;
-    isStatic: boolean | undefined;
-    permissions: string[] | undefined;
+    grantedPermissions: string[] | undefined;
 
     constructor(data?: ICreateRoleDto) {
         if (data) {
@@ -1951,11 +1950,10 @@ export class CreateRoleDto implements ICreateRoleDto {
             this.displayName = data["displayName"];
             this.normalizedName = data["normalizedName"];
             this.description = data["description"];
-            this.isStatic = data["isStatic"];
-            if (data["permissions"] && data["permissions"].constructor === Array) {
-                this.permissions = [];
-                for (let item of data["permissions"])
-                    this.permissions.push(item);
+            if (data["grantedPermissions"] && data["grantedPermissions"].constructor === Array) {
+                this.grantedPermissions = [];
+                for (let item of data["grantedPermissions"])
+                    this.grantedPermissions.push(item);
             }
         }
     }
@@ -1973,11 +1971,10 @@ export class CreateRoleDto implements ICreateRoleDto {
         data["displayName"] = this.displayName;
         data["normalizedName"] = this.normalizedName;
         data["description"] = this.description;
-        data["isStatic"] = this.isStatic;
-        if (this.permissions && this.permissions.constructor === Array) {
-            data["permissions"] = [];
-            for (let item of this.permissions)
-                data["permissions"].push(item);
+        if (this.grantedPermissions && this.grantedPermissions.constructor === Array) {
+            data["grantedPermissions"] = [];
+            for (let item of this.grantedPermissions)
+                data["grantedPermissions"].push(item);
         }
         return data; 
     }
@@ -1995,17 +1992,15 @@ export interface ICreateRoleDto {
     displayName: string;
     normalizedName: string | undefined;
     description: string | undefined;
-    isStatic: boolean | undefined;
-    permissions: string[] | undefined;
+    grantedPermissions: string[] | undefined;
 }
 
 export class RoleDto implements IRoleDto {
     name: string;
     displayName: string;
     normalizedName: string | undefined;
     description: string | undefined;
-    isStatic: boolean | undefined;
-    permissions: string[] | undefined;
+    grantedPermissions: string[] | undefined;
     id: number | undefined;
 
     constructor(data?: IRoleDto) {
@@ -2023,11 +2018,10 @@ export class RoleDto implements IRoleDto {
             this.displayName = data["displayName"];
             this.normalizedName = data["normalizedName"];
             this.description = data["description"];
-            this.isStatic = data["isStatic"];
-            if (data["permissions"] && data["permissions"].constructor === Array) {
-                this.permissions = [];
-                for (let item of data["permissions"])
-                    this.permissions.push(item);
+            if (data["grantedPermissions"] && data["grantedPermissions"].constructor === Array) {
+                this.grantedPermissions = [];
+                for (let item of data["grantedPermissions"])
+                    this.grantedPermissions.push(item);
             }
             this.id = data["id"];
         }
@@ -2046,11 +2040,10 @@ export class RoleDto implements IRoleDto {
         data["displayName"] = this.displayName;
         data["normalizedName"] = this.normalizedName;
         data["description"] = this.description;
-        data["isStatic"] = this.isStatic;
-        if (this.permissions && this.permissions.constructor === Array) {
-            data["permissions"] = [];
-            for (let item of this.permissions)
-                data["permissions"].push(item);
+        if (this.grantedPermissions && this.grantedPermissions.constructor === Array) {
+            data["grantedPermissions"] = [];
+            for (let item of this.grantedPermissions)
+                data["grantedPermissions"].push(item);
         }
         data["id"] = this.id;
         return data; 
@@ -2069,8 +2062,7 @@ export interface IRoleDto {
     displayName: string;
     normalizedName: string | undefined;
     description: string | undefined;
-    isStatic: boolean | undefined;
-    permissions: string[] | undefined;
+    grantedPermissions: string[] | undefined;
     id: number | undefined;
 }
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/CreateRoleDto.cs b/aspnet-core/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]
@@ -22,6 +20,6 @@ public class CreateRoleDto
         [StringLength(Role.MaxDescriptionLength)]
         public string Description { get; set; }
 
-        public List<string> Permissions { get; set; }
+        public List<string> GrantedPermissions { get; set; }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleDto.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleDto.cs
@@ -7,7 +7,6 @@
 
 namespace AbpCompanyName.AbpProjectName.Roles.Dto
 {
-    [AutoMap(typeof(Role))]
     public class RoleDto : EntityDto<int>
     {
         [Required]
@@ -23,6 +22,6 @@ public class RoleDto : EntityDto<int>
         [StringLength(Role.MaxDescriptionLength)]
         public string Description { get; set; }
 
-        public List<string> Permissions { get; set; }
+        public List<string> GrantedPermissions { get; set; }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleMapProfile.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleMapProfile.cs
@@ -1,4 +1,5 @@
-﻿using AutoMapper;
+using System.Linq;
+using AutoMapper;
 using Abp.Authorization;
 using Abp.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
@@ -13,8 +14,12 @@ public RoleMapProfile()
             CreateMap<Permission, string>().ConvertUsing(r => r.Name);
             CreateMap<RolePermissionSetting, string>().ConvertUsing(r => r.Name);
 
-            CreateMap<CreateRoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
-            CreateMap<RoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
+            CreateMap<CreateRoleDto, Role>();
+
+            CreateMap<RoleDto, Role>();
+
+            CreateMap<Role, RoleDto>().ForMember(x => x.GrantedPermissions,
+                opt => opt.MapFrom(x => x.Permissions.Where(p => p.IsGranted)));
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs
@@ -41,7 +41,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);
@@ -74,7 +74,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);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Roles/Index.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/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");
 			if (_$permissionCheckboxes) {
 				for (var permissionIndex = 0; permissionIndex < _$permissionCheckboxes.length; permissionIndex++) {
 					var _$permissionCheckbox = $(_$permissionCheckboxes[permissionIndex]);
-					role.permissions.push(_$permissionCheckbox.val());
+                    role.grantedPermissions.push(_$permissionCheckbox.val());
 				}
 			}
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Roles/_EditRoleModal.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/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());
             }
         }
         
diff --git a/reactjs/src/models/Roles/roleModel.ts b/reactjs/src/models/Roles/roleModel.ts
@@ -2,7 +2,6 @@ class RoleModel {
   name: string;
   displayName: string;
   description?: any;
-  isStatic: boolean;
   id: number;
 }
 
diff --git a/reactjs/src/scenes/Roles/components/createOrUpdateRole.tsx b/reactjs/src/scenes/Roles/components/createOrUpdateRole.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Form, Input, Checkbox, Modal, Tabs } from 'antd';
+import { Form, Input, Modal, Tabs } from 'antd';
 import FormItem from 'antd/lib/form/FormItem';
 import CheckboxGroup from 'antd/lib/checkbox/Group';
 import { GetAllPermissionsOutput } from 'src/services/role/dto/getAllPermissionsOutput';
@@ -89,15 +89,12 @@ class CreateOrUpdateRole extends React.Component<ICreateOrUpdateRoleProps> {
               {getFieldDecorator('displayName', { rules: rules.displayName })(<Input />)}
             </FormItem>
             <FormItem label={L('Description')} {...formItemLayout}>
-              {getFieldDecorator('description', { rules: rules.description })(<Input />)}
-            </FormItem>
-            <FormItem label={L('IsStatic')} {...tailFormItemLayout}>
-              {getFieldDecorator('isStatic', { rules: rules.isStatic, valuePropName: 'checked' })(<Checkbox />)}
+              {getFieldDecorator('description')(<Input />)}
             </FormItem>
           </TabPane>
           <TabPane tab={L('RolePermission')} key={'permission'}>
             <FormItem {...tailFormItemLayout}>
-              {getFieldDecorator('permissions', { valuePropName: 'value' })(<CheckboxGroup options={options} />)}
+              {getFieldDecorator('grantedPermissions', { valuePropName: 'value' })(<CheckboxGroup options={options} />)}
             </FormItem>
           </TabPane>
         </Tabs>
diff --git a/reactjs/src/scenes/Roles/components/createOrUpdateRole.validation.ts b/reactjs/src/scenes/Roles/components/createOrUpdateRole.validation.ts
@@ -2,9 +2,7 @@ import { L } from 'src/lib/abpUtility';
 
 const rules = {
   name: [{ required: true, message: L('ThisFieldIsRequired') }],
-  displayName: [{ required: true, message: L('ThisFieldIsRequired') }],
-  description: [{ required: true, message: L('ThisFieldIsRequired') }],
-  isStatic: [{ required: true, message: L('ThisFieldIsRequired') }],
+  displayName: [{ required: true, message: L('ThisFieldIsRequired') }]
 };
 
 export default rules;
diff --git a/reactjs/src/scenes/Roles/index.tsx b/reactjs/src/scenes/Roles/index.tsx
@@ -69,7 +69,7 @@ class Role extends AppComponentBase<IRoleProps, IRoleState> {
 
     this.formRef.props.form.setFieldsValue({
       ...this.props.roleStore.roleEdit.role,
-      permissions: this.props.roleStore.roleEdit.grantedPermissionNames,
+      grantedPermissions: this.props.roleStore.roleEdit.grantedPermissionNames,
     });
   }
 
diff --git a/reactjs/src/services/role/dto/createRoleInput.ts b/reactjs/src/services/role/dto/createRoleInput.ts
@@ -3,6 +3,5 @@ export interface CreateRoleInput {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
-  permissions: string[];
+  grantedPermissions: string[];
 }
diff --git a/reactjs/src/services/role/dto/createRoleOutput.ts b/reactjs/src/services/role/dto/createRoleOutput.ts
@@ -3,7 +3,6 @@ export interface CreateRoleOutput {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
   permissions: string[];
   id: number;
 }
diff --git a/reactjs/src/services/role/dto/getAllRoleOutput.ts b/reactjs/src/services/role/dto/getAllRoleOutput.ts
@@ -3,7 +3,6 @@ export interface GetAllRoleOutput {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
-  permissions: string[];
+  grantedPermissions: string[];
   id: number;
 }
diff --git a/reactjs/src/services/role/dto/getRoleAsyncOutput.ts b/reactjs/src/services/role/dto/getRoleAsyncOutput.ts
@@ -1,8 +1,8 @@
 export interface GetRoleAsyncOutputItem {
   name: string;
   displayName: string;
-  isStatic: boolean;
   isDefault: boolean;
+  isStatic: boolean;
   creationTime: Date;
   id: number;
 }
diff --git a/reactjs/src/services/role/dto/getRoleForEditOutput.ts b/reactjs/src/services/role/dto/getRoleForEditOutput.ts
@@ -2,7 +2,6 @@ export interface Role {
   name: string;
   displayName: string;
   description?: any;
-  isStatic: boolean;
   id: number;
 }
 
diff --git a/reactjs/src/services/role/dto/updateRoleInput.ts b/reactjs/src/services/role/dto/updateRoleInput.ts
@@ -3,7 +3,6 @@ export interface UpdateRoleInput {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
-  permissions: string[];
+  grantedPermissions: string[];
   id: number;
 }
diff --git a/reactjs/src/services/role/dto/updateRoleOutput.ts b/reactjs/src/services/role/dto/updateRoleOutput.ts
@@ -3,7 +3,6 @@ export interface UpdateRoleOutput {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
-  permissions: string[];
+  grantedPermissions: string[];
   id: number;
 }
diff --git a/reactjs/src/services/user/dto/getRolesOuput.ts b/reactjs/src/services/user/dto/getRolesOuput.ts
@@ -3,7 +3,6 @@ export interface GetRoles {
   displayName: string;
   normalizedName: string;
   description: string;
-  isStatic: boolean;
-  permissions: string[];
+  grantedPermissions: string[];
   id: number;
 }
diff --git a/reactjs/src/stores/roleStore.ts b/reactjs/src/stores/roleStore.ts
@@ -27,7 +27,6 @@ class RoleStore {
         name: '',
         displayName: '',
         description: '',
-        isStatic: false,
         id: 0,
       },
       permissions: [{ name: '', displayName: '', description: '' }],
diff --git a/vue/src/store/entities/role.ts b/vue/src/store/entities/role.ts
@@ -5,6 +5,5 @@ export default class Role extends Entity<number>{
     displayName:string;
     normalizedName:string;
     description:string;
-    isStatic:boolean;
-    permissions:string[]
+    grantedPermissions:string[]
 }
diff --git a/vue/src/views/setting/role/create-role.vue b/vue/src/views/setting/role/create-role.vue
@@ -20,7 +20,7 @@
                         </FormItem>
                       </TabPane>
                     <TabPane :label="L('RolePermission')" name="permission">
-                        <CheckboxGroup v-model="role.permissions">
+                        <CheckboxGroup v-model="role.grantedPermissions">
                             <Checkbox :label="permission.name" v-for="permission in permissions" :key="permission.name"><span>{{permission.displayName}}</span></Checkbox>
                         </CheckboxGroup>
                     </TabPane>
@@ -48,8 +48,8 @@
         save(){
             (this.$refs.roleForm as any).validate(async (valid:boolean)=>{
                 if(valid){
-                    if(!this.role.permissions){
-                        this.role.permissions=[];
+                    if(!this.role.grantedPermissions){
+                        this.role.grantedPermissions=[];
                     }
                     await this.$store.dispatch({
                         type:'role/create',
diff --git a/vue/src/views/setting/role/edit-role.vue b/vue/src/views/setting/role/edit-role.vue
@@ -20,7 +20,7 @@
                         </FormItem>
                       </TabPane>
                     <TabPane :label="L('RolePermission')" name="permission">
-                        <CheckboxGroup v-model="role.permissions">
+                        <CheckboxGroup v-model="role.grantedPermissions">
                             <Checkbox :label="permission.name" v-for="permission in permissions" :key="permission.name"><span>{{permission.displayName}}</span></Checkbox>
                         </CheckboxGroup>
                     </TabPane>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.ComponentModel.DataAnnotations;`
`3`	`3`	`using Abp.Authorization.Roles;`
`4`		`-using Abp.AutoMapper;`
`5`	`4`	`using AbpCompanyName.AbpProjectName.Authorization.Roles;`
`6`	`5`
`7`	`6`	`namespace AbpCompanyName.AbpProjectName.Roles.Dto`
`8`	`7`	`{`
`9`		`- [AutoMapTo(typeof(Role))]`
`10`	`8`	`public class CreateRoleDto`
`11`	`9`	`{`
`12`	`10`	`[Required]`
`@@ -22,6 +20,6 @@ public class CreateRoleDto`
`22`	`20`	`[StringLength(Role.MaxDescriptionLength)]`
`23`	`21`	`public string Description { get; set; }`
`24`	`22`
`25`		`- public List<string> Permissions { get; set; }`
	`23`	`+ public List<string> GrantedPermissions { get; set; }`
`26`	`24`	`}`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace AbpCompanyName.AbpProjectName.Roles.Dto`
`9`	`9`	`{`
`10`		`- [AutoMap(typeof(Role))]`
`11`	`10`	`public class RoleDto : EntityDto<int>`
`12`	`11`	`{`
`13`	`12`	`[Required]`
`@@ -23,6 +22,6 @@ public class RoleDto : EntityDto<int>`
`23`	`22`	`[StringLength(Role.MaxDescriptionLength)]`
`24`	`23`	`public string Description { get; set; }`
`25`	`24`
`26`		`- public List<string> Permissions { get; set; }`
	`25`	`+ public List<string> GrantedPermissions { get; set; }`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`var role = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js`
`45`		`- role.permissions = [];`
	`45`	`+ role.grantedPermissions = [];`
`46`	`46`	`var _$permissionCheckboxes = $("input[name='permission']:checked");`
`47`	`47`	`if (_$permissionCheckboxes) {`
`48`	`48`	`for (var permissionIndex = 0; permissionIndex < _$permissionCheckboxes.length; permissionIndex++) {`
`49`	`49`	`var _$permissionCheckbox = $(_$permissionCheckboxes[permissionIndex]);`
`50`		`- role.permissions.push(_$permissionCheckbox.val());`
	`50`	`+ role.grantedPermissions.push(_$permissionCheckbox.val());`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`var role = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js`
`14`		`- role.permissions = [];`
	`14`	`+ role.grantedPermissions = [];`
`15`	`15`	`var _$permissionCheckboxes = $("input[name='permission']:checked:visible");`
`16`	`16`	`if (_$permissionCheckboxes) {`
`17`	`17`	`for (var permissionIndex = 0; permissionIndex < _$permissionCheckboxes.length; permissionIndex++) {`
`18`	`18`	`var _$permissionCheckbox = $(_$permissionCheckboxes[permissionIndex]);`
`19`		`- role.permissions.push(_$permissionCheckbox.val());`
	`19`	`+ role.grantedPermissions.push(_$permissionCheckbox.val());`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ class RoleModel {`
`2`	`2`	`name: string;`
`3`	`3`	`displayName: string;`
`4`	`4`	`description?: any;`
`5`		`- isStatic: boolean;`
`6`	`5`	`id: number;`
`7`	`6`	`}`
`8`	`7`