Skip to content

Commit 5579fb7

Browse files
committed
Rename ManagementPermission to ManagementPermissionName
1 parent ae06975 commit 5579fb7

File tree

11 files changed

+36
-34
lines changed

11 files changed

+36
-34
lines changed

framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionDefinitionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PermissionGroupDefinition AddGroup(
5252
PermissionDefinition AddResourcePermission(
5353
string name,
5454
string resourceName,
55-
string managementPermission,
55+
string managementPermissionName,
5656
ILocalizableString? displayName = null,
5757
MultiTenancySides multiTenancySide = MultiTenancySides.Both,
5858
bool isEnabled = true);

framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionDefinition.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class PermissionDefinition :
2424
/// <summary>
2525
/// Management permission of the resource permission.
2626
/// </summary>
27-
public string? ManagementPermission { get; set; }
27+
public string? ManagementPermissionName { get; set; }
2828

2929
/// <summary>
3030
/// Parent of this permission if one exists.
@@ -89,14 +89,14 @@ public object? this[string name] {
8989
protected internal PermissionDefinition(
9090
[NotNull] string name,
9191
string resourceName,
92-
string managementPermission,
92+
string managementPermissionName,
9393
ILocalizableString? displayName = null,
9494
MultiTenancySides multiTenancySide = MultiTenancySides.Both,
9595
bool isEnabled = true)
9696
: this(name, displayName, multiTenancySide, isEnabled)
9797
{
9898
ResourceName = Check.NotNull(resourceName, nameof(resourceName));
99-
ManagementPermission = Check.NotNull(managementPermission, nameof(managementPermission));
99+
ManagementPermissionName = Check.NotNull(managementPermissionName, nameof(managementPermissionName));
100100
}
101101

102102
protected internal PermissionDefinition(

framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionDefinitionContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ public virtual void RemoveGroup(string name)
9595
public virtual PermissionDefinition AddResourcePermission(
9696
string name,
9797
string resourceName,
98-
string managementPermission,
98+
string managementPermissionName,
9999
ILocalizableString? displayName = null,
100100
MultiTenancySides multiTenancySide = MultiTenancySides.Both,
101101
bool isEnabled = true)
102102
{
103103
Check.NotNull(name, nameof(name));
104104
Check.NotNull(resourceName, nameof(resourceName));
105-
Check.NotNull(managementPermission, nameof(managementPermission));
105+
Check.NotNull(managementPermissionName, nameof(managementPermissionName));
106106

107107
if (ResourcePermissions.Any(x => x.ResourceName == resourceName && x.Name == name))
108108
{
@@ -112,7 +112,7 @@ public virtual PermissionDefinition AddResourcePermission(
112112
var permission = new PermissionDefinition(
113113
name,
114114
resourceName,
115-
managementPermission,
115+
managementPermissionName,
116116
displayName,
117117
multiTenancySide,
118118
isEnabled)

framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/TestServices/Resources/AuthorizationTestResourcePermissionDefinitionProvider.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@ public override void Define(IPermissionDefinitionContext context)
1515
}
1616
getGroup.AddPermission("TestEntityManagementPermission");
1717

18-
var permission1 = context.AddResourcePermission("MyResourcePermission1", resourceName: TestEntityResource.ResourceName, managementPermission: "TestEntityManagementPermission");
18+
var permission1 = context.AddResourcePermission("MyResourcePermission1", resourceName: TestEntityResource.ResourceName, "TestEntityManagementPermission");
1919
Assert.Throws<AbpException>(() =>
2020
{
2121
permission1.AddChild("MyResourcePermission1.ChildPermission1");
2222
}).Message.ShouldBe($"Resource permission cannot have child permissions. Resource: {TestEntityResource.ResourceName}");
2323
permission1.StateCheckers.Add(new TestRequireEditionPermissionSimpleStateChecker());;
2424
permission1[PermissionDefinitionContext.KnownPropertyNames.CurrentProviderName].ShouldBe(typeof(AuthorizationTestResourcePermissionDefinitionProvider).FullName);
2525

26-
context.AddResourcePermission("MyResourcePermission2", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission");
27-
context.AddResourcePermission("MyResourcePermission3", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission");
28-
context.AddResourcePermission("MyResourcePermission4", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission");
29-
context.AddResourcePermission("MyResourcePermission5", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission");
30-
context.AddResourcePermission("MyResourcePermission6", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider1));
31-
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider2));
26+
context.AddResourcePermission("MyResourcePermission2", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission");
27+
context.AddResourcePermission("MyResourcePermission3", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission");
28+
context.AddResourcePermission("MyResourcePermission4", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission");
29+
context.AddResourcePermission("MyResourcePermission5", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission");
30+
context.AddResourcePermission("MyResourcePermission6", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider1));
31+
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider2));
3232

3333
Assert.Throws<AbpException>(() =>
3434
{
35-
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource).FullName!, managementPermission: "TestEntityManagementPermission");
35+
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource).FullName!, "TestEntityManagementPermission");
3636
}).Message.ShouldBe($"There is already an existing resource permission with name: MyResourcePermission7 for resource: {typeof(TestEntityResource).FullName}");
3737

38-
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource2).FullName!, managementPermission: "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider2));
38+
context.AddResourcePermission("MyResourcePermission7", resourceName: typeof(TestEntityResource2).FullName!, "TestEntityManagementPermission").WithProviders(nameof(TestResourcePermissionValueProvider2));
3939

4040
context.GetResourcePermissionOrNull(TestEntityResource.ResourceName, "MyResourcePermission1").ShouldNotBeNull();
4141
context.GetResourcePermissionOrNull(TestEntityResource.ResourceName, "MyResourcePermission7").ShouldNotBeNull();
4242
context.GetResourcePermissionOrNull(TestEntityResource2.ResourceName, "MyResourcePermission7").ShouldNotBeNull();
43+
context.GetResourcePermissionOrNull(TestEntityResource.ResourceName, "MyResourcePermission9").ShouldBeNull();
44+
context.GetResourcePermissionOrNull(TestEntityResource2.ResourceName, "MyResourcePermission6").ShouldBeNull();
4345
}
4446
}

modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public virtual async Task<GetResourceProviderListResultDto> GetResourceProviderK
170170
{
171171
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
172172
if (!resourcePermissions.Any() ||
173-
!await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermission!).ToArray()))
173+
!await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermissionName!).ToArray()))
174174
{
175175
return new GetResourceProviderListResultDto();;
176176
}
@@ -190,7 +190,7 @@ public virtual async Task<SearchProviderKeyListResultDto> SearchResourceProvider
190190
{
191191
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
192192
if (!resourcePermissions.Any() ||
193-
!await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermission!).ToArray()))
193+
!await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermissionName!).ToArray()))
194194
{
195195
return new SearchProviderKeyListResultDto();;
196196
}
@@ -217,7 +217,7 @@ public virtual async Task<GetResourcePermissionDefinitionListResultDto> GetResou
217217
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
218218
foreach (var resourcePermission in resourcePermissions)
219219
{
220-
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermission!))
220+
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
221221
{
222222
result.Permissions.Add(new ResourcePermissionDefinitionDto()
223223
{
@@ -257,7 +257,7 @@ public virtual async Task<GetResourcePermissionListResultDto> GetResourceAsync(s
257257
continue;
258258
}
259259

260-
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermission!))
260+
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
261261
{
262262
resourcePermissionGrantInfoDto.Permissions.Add(new GrantedResourcePermissionDto()
263263
{
@@ -290,7 +290,7 @@ public virtual async Task<GetResourcePermissionWithProviderListResultDto> GetRes
290290
continue;
291291
}
292292

293-
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermission!))
293+
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
294294
{
295295
result.Permissions.Add(new ResourcePermissionWithProdiverGrantInfoDto
296296
{
@@ -309,7 +309,7 @@ public virtual async Task UpdateResourceAsync(string resourceName, string resour
309309
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
310310
foreach (var resourcePermission in resourcePermissions)
311311
{
312-
if (!await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermission!))
312+
if (!await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
313313
{
314314
continue;
315315
}
@@ -323,7 +323,7 @@ public virtual async Task DeleteResourceAsync(string resourceName, string resour
323323
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
324324
foreach (var resourcePermission in resourcePermissions)
325325
{
326-
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermission!))
326+
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
327327
{
328328
await ResourcePermissionManager.DeleteAsync(resourcePermission.Name, resourceName, resourceKey, providerName, providerKey);
329329
}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/PermissionDefinitionRecordConsts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ public class PermissionDefinitionRecordConsts
1515

1616
public static int MaxResourceNameLength { get; set; } = 256;
1717

18-
public static int MaxManagementPermissionLength { get; set; } = 128;
18+
public static int MaxManagementPermissionNameLength { get; set; } = 128;
1919
}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/DynamicPermissionDefinitionStoreInMemoryCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Task FillAsync(
5353
{
5454
context.AddResourcePermission(resourcePermission.Name,
5555
resourcePermission.ResourceName,
56-
resourcePermission.ManagementPermission,
56+
resourcePermission.ManagementPermissionName,
5757
resourcePermission.DisplayName != null ? LocalizableStringSerializer.Deserialize(resourcePermission.DisplayName) : null,
5858
resourcePermission.MultiTenancySide,
5959
resourcePermission.IsEnabled);

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionRecord.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class PermissionDefinitionRecord : BasicAggregateRoot<Guid>, IHasExtraPro
1414

1515
public string ResourceName { get; set; }
1616

17-
public string ManagementPermission { get; set; }
17+
public string ManagementPermissionName { get; set; }
1818

1919
public string ParentName { get; set; }
2020

@@ -47,7 +47,7 @@ public PermissionDefinitionRecord(
4747
string groupName,
4848
string name,
4949
string resourceName,
50-
string managementPermission,
50+
string managementPermissionName,
5151
string parentName,
5252
string displayName,
5353
bool isEnabled = true,
@@ -63,7 +63,7 @@ public PermissionDefinitionRecord(
6363
}
6464
Name = Check.NotNullOrWhiteSpace(name, nameof(name), PermissionDefinitionRecordConsts.MaxNameLength);
6565
ResourceName = resourceName;
66-
ManagementPermission = managementPermission;
66+
ManagementPermissionName = managementPermissionName;
6767
ParentName = Check.Length(parentName, nameof(parentName), PermissionDefinitionRecordConsts.MaxNameLength);
6868
DisplayName = Check.NotNullOrWhiteSpace(displayName, nameof(displayName), PermissionDefinitionRecordConsts.MaxDisplayNameLength);
6969
IsEnabled = isEnabled;
@@ -87,7 +87,7 @@ public bool HasSameData(PermissionDefinitionRecord otherRecord)
8787
return false;
8888
}
8989

90-
if (ManagementPermission != otherRecord.ManagementPermission)
90+
if (ManagementPermissionName != otherRecord.ManagementPermissionName)
9191
{
9292
return false;
9393
}
@@ -147,9 +147,9 @@ public void Patch(PermissionDefinitionRecord otherRecord)
147147
ResourceName = otherRecord.ResourceName;
148148
}
149149

150-
if (ManagementPermission != otherRecord.ManagementPermission)
150+
if (ManagementPermissionName != otherRecord.ManagementPermissionName)
151151
{
152-
ManagementPermission = otherRecord.ManagementPermission;
152+
ManagementPermissionName = otherRecord.ManagementPermissionName;
153153
}
154154

155155
if (GroupName != otherRecord.GroupName)

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public virtual Task<PermissionDefinitionRecord> SerializeAsync(
8787
permissionGroup?.Name,
8888
permission.Name,
8989
permission.ResourceName,
90-
permission.ManagementPermission,
90+
permission.ManagementPermissionName,
9191
permission.Parent?.Name,
9292
LocalizableStringSerializer.Serialize(permission.DisplayName),
9393
permission.IsEnabled,

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementDbContextModelBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static void ConfigurePermissionManagement(
7272
b.Property(x => x.GroupName).HasMaxLength(PermissionGroupDefinitionRecordConsts.MaxNameLength);
7373
b.Property(x => x.Name).HasMaxLength(PermissionDefinitionRecordConsts.MaxNameLength).IsRequired();
7474
b.Property(x => x.ResourceName).HasMaxLength(PermissionDefinitionRecordConsts.MaxResourceNameLength);
75-
b.Property(x => x.ManagementPermission).HasMaxLength(PermissionDefinitionRecordConsts.MaxManagementPermissionLength);
75+
b.Property(x => x.ManagementPermissionName).HasMaxLength(PermissionDefinitionRecordConsts.MaxManagementPermissionNameLength);
7676
b.Property(x => x.ParentName).HasMaxLength(PermissionDefinitionRecordConsts.MaxNameLength);
7777
b.Property(x => x.DisplayName).HasMaxLength(PermissionDefinitionRecordConsts.MaxDisplayNameLength).IsRequired();
7878
b.Property(x => x.Providers).HasMaxLength(PermissionDefinitionRecordConsts.MaxProvidersLength);

0 commit comments

Comments
 (0)