Browse Source

Enable nullable annotations for Volo.Abp.Authorization

pull/17108/head
liangshiwei 3 years ago
parent
commit
50bd9ac75b
  1. 3
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionDefinitionManager.cs
  2. 5
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionValueCheckContext.cs
  3. 5
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionValuesCheckContext.cs
  4. 4
      framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs
  5. 2
      framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs

3
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionDefinitionManager.cs

@ -9,8 +9,7 @@ public interface IPermissionDefinitionManager
[ItemNotNull]
Task<PermissionDefinition> GetAsync([NotNull] string name);
[ItemCanBeNull]
Task<PermissionDefinition> GetOrNullAsync([NotNull] string name);
Task<PermissionDefinition?> GetOrNullAsync([NotNull] string name);
Task<IReadOnlyList<PermissionDefinition>> GetPermissionsAsync();

5
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionValueCheckContext.cs

@ -8,12 +8,11 @@ public class PermissionValueCheckContext
[NotNull]
public PermissionDefinition Permission { get; }
[CanBeNull]
public ClaimsPrincipal Principal { get; }
public ClaimsPrincipal? Principal { get; }
public PermissionValueCheckContext(
[NotNull] PermissionDefinition permission,
[CanBeNull] ClaimsPrincipal principal)
ClaimsPrincipal? principal)
{
Check.NotNull(permission, nameof(permission));

5
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/PermissionValuesCheckContext.cs

@ -9,12 +9,11 @@ public class PermissionValuesCheckContext
[NotNull]
public List<PermissionDefinition> Permissions { get; }
[CanBeNull]
public ClaimsPrincipal Principal { get; }
public ClaimsPrincipal? Principal { get; }
public PermissionValuesCheckContext(
[NotNull] List<PermissionDefinition> permissions,
[CanBeNull] ClaimsPrincipal principal)
ClaimsPrincipal? principal)
{
Check.NotNull(permissions, nameof(permissions));

4
framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionChecker.cs

@ -38,7 +38,7 @@ public class PermissionChecker : IPermissionChecker, ITransientDependency
}
public virtual async Task<bool> IsGrantedAsync(
ClaimsPrincipal claimsPrincipal,
ClaimsPrincipal? claimsPrincipal,
string name)
{
Check.NotNull(name, nameof(name));
@ -97,7 +97,7 @@ public class PermissionChecker : IPermissionChecker, ITransientDependency
return await IsGrantedAsync(PrincipalAccessor.Principal, names);
}
public async Task<MultiplePermissionGrantResult> IsGrantedAsync(ClaimsPrincipal claimsPrincipal, string[] names)
public async Task<MultiplePermissionGrantResult> IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, string[] names)
{
Check.NotNull(names, nameof(names));

2
framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs

@ -30,7 +30,7 @@ public class PermissionDefinitionManager : IPermissionDefinitionManager, ITransi
return permission;
}
public virtual async Task<PermissionDefinition> GetOrNullAsync(string name)
public virtual async Task<PermissionDefinition?> GetOrNullAsync(string name)
{
Check.NotNull(name, nameof(name));

Loading…
Cancel
Save