diff --git a/MainProject.Tests/Config/permissions.json b/MainProject.Tests/Config/permissions.json index b1a82dd..04a7e8e 100644 --- a/MainProject.Tests/Config/permissions.json +++ b/MainProject.Tests/Config/permissions.json @@ -6,10 +6,10 @@ { "Module": "roles", "Operations": [ - { "Operation": "create", "Roles": [] }, + { "Operation": "create", "Roles": ["Admin"] }, { "Operation": "read", "Roles": [] }, - { "Operation": "update", "Roles": [] }, - { "Operation": "delete", "Roles": [] }, + { "Operation": "update", "Roles": ["Admin"] }, + { "Operation": "delete", "Roles": ["Admin"] }, { "Operation": "list", "Roles": [] }, { "Operation": "use", "Roles": [] } ] diff --git a/MainProject.Tests/Services/PermissionService_Tests.cs b/MainProject.Tests/Services/PermissionService_Tests.cs index 591d653..a465849 100644 --- a/MainProject.Tests/Services/PermissionService_Tests.cs +++ b/MainProject.Tests/Services/PermissionService_Tests.cs @@ -1103,6 +1103,10 @@ public class PermissionService_Tests Assert.IsTrue(cleanedPermissions.Contains("base.roles.list")); Assert.IsTrue(cleanedPermissions.Contains("base.roles.use")); + Assert.IsTrue(cleanedPermissions.Contains("base.roles.create for role Admin")); + Assert.IsTrue(cleanedPermissions.Contains("base.roles.update for role Admin")); + Assert.IsTrue(cleanedPermissions.Contains("base.roles.delete for role Admin")); + Assert.IsTrue(cleanedPermissions.Contains("base.users.create")); Assert.IsTrue(cleanedPermissions.Contains("base.users.read")); Assert.IsTrue(cleanedPermissions.Contains("base.users.update")); diff --git a/MainProject/MainProject.csproj b/MainProject/MainProject.csproj index 78530da..24c681d 100644 --- a/MainProject/MainProject.csproj +++ b/MainProject/MainProject.csproj @@ -30,21 +30,21 @@ all - + - - + + - - - - + + + + diff --git a/MainProject/Services/PermissionService.cs b/MainProject/Services/PermissionService.cs index af81acd..8ab2923 100644 --- a/MainProject/Services/PermissionService.cs +++ b/MainProject/Services/PermissionService.cs @@ -1107,6 +1107,8 @@ public class PermissionService : BaseService, IPermissionService ( roles, permissionSystemModuleOperation, operationInfo ); + newPermissions.AddRange(tmpPermissions); + rolePermissionSystemModuleOperationList.AddRange(tmpRolePermissionSystemModuleOperationList); } } }