diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index a2c5dce5fb..67d2d49ce2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -1,5 +1,5 @@ @page "/identity/roles" -@attribute [Authorize] +@attribute [Authorize(IdentityPermissions.Roles.Default)] @using Volo.Abp.Identity @using Microsoft.AspNetCore.Authorization @using Microsoft.Extensions.Localization @@ -7,15 +7,20 @@ @using Volo.Abp.PermissionManagement.Blazor.Components @inherits RoleManagementBase @inject IStringLocalizer L +@inject IAuthorizationService AuthorizationService + @* ************************* PAGE HEADER ************************* *@

@L["Roles"]

- - - + @if (canCreate) + { + + + + }
@@ -27,21 +32,33 @@ ShowPager="true" PageSize="PageSize"> - - - - - @L["Actions"] - - - @L["Edit"] - @L["Permissions"] - - @L["Delete"] - - - - + @if (canEdit || canDelete || canEditPermissions) + { + + + + + @L["Actions"] + + + @if (canEdit) + { + @L["Edit"] + } + @if (canEditPermissions) + { + @L["Permissions"] + } + @if (canDelete) + { + + @L["Delete"] + } + + + + + } @(context.As().Name) @@ -110,3 +127,21 @@ + +@code +{ + bool canCreate; + bool canEdit; + bool canDelete; + bool canEditPermissions; + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + + canCreate =await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.Create); + canEdit = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.Update); + canDelete = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.Delete); + canEditPermissions = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.ManagePermissions); + } +} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index ca813229c3..899c28ef51 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -1,5 +1,5 @@ @page "/identity/users" -@attribute [Authorize] +@attribute [Authorize(IdentityPermissions.Users.Default)] @using Microsoft.AspNetCore.Authorization @using Microsoft.Extensions.Localization @using Volo.Abp.Application.Dtos @@ -7,6 +7,7 @@ @using Volo.Abp.PermissionManagement.Blazor.Components @inherits UserManagementBase @inject IStringLocalizer L +@inject IAuthorizationService AuthorizationService @* ************************* PAGE HEADER ************************* *@ @@ -14,9 +15,12 @@

@L["Users"]

- - - + @if (canCreate) + { + + + + }
@@ -28,21 +32,33 @@ ShowPager="true" PageSize="PageSize"> - - - - - @L["Actions"] - - - @L["Edit"] - @L["Permissions"] - - @L["Delete"] - - - - + @if (canEdit || canDelete || canEditPermissions) + { + + + + + @L["Actions"] + + + @if (canEdit) + { + @L["Edit"] + } + @if (canEditPermissions) + { + @L["Permissions"] + } + @if (canDelete) + { + + @L["Delete"] + } + + + + + } @(context.As().UserName) @@ -202,3 +218,21 @@ + +@code +{ + bool canCreate; + bool canEdit; + bool canDelete; + bool canEditPermissions; + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + + canCreate =await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.Create); + canEdit = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.Update); + canDelete = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.Delete); + canEditPermissions = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.ManagePermissions); + } +} \ No newline at end of file