Browse Source

Remove JetBrains.Annotations and improve formatting

Removed all usages of JetBrains.Annotations attributes and related imports from resource permission interfaces and context classes. Reformatted method signatures and constructors for better readability and consistency.
pull/24374/head
Halil İbrahim Kalkan 10 months ago
parent
commit
0658ad8e85
  1. 1
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs
  2. 27
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs
  3. 1
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs
  4. 1
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs
  5. 12
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs
  6. 7
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs
  7. 11
      framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs

1
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs

@ -6,7 +6,6 @@ public interface IPermissionValueProvider
{
string Name { get; }
//TODO: Rename to GetResult? (CheckAsync throws exception by naming convention)
Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context);
Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context);

27
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs

@ -1,16 +1,33 @@
using System.Security.Claims;
using System.Threading.Tasks;
using JetBrains.Annotations;
namespace Volo.Abp.Authorization.Permissions.Resources;
public interface IResourcePermissionChecker
{
Task<bool> IsGrantedAsync([NotNull] string name, string resourceName, string resourceKey);
Task<bool> IsGrantedAsync(
string name,
string resourceName,
string resourceKey
);
Task<bool> IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, [NotNull] string name, string resourceName, string resourceKey);
Task<bool> IsGrantedAsync(
ClaimsPrincipal? claimsPrincipal,
string name,
string resourceName,
string resourceKey
);
Task<MultiplePermissionGrantResult> IsGrantedAsync([NotNull] string[] names, string resourceName, string resourceKey);
Task<MultiplePermissionGrantResult> IsGrantedAsync(
string[] names,
string resourceName,
string resourceKey
);
Task<MultiplePermissionGrantResult> IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, [NotNull] string[] names, string resourceName, string resourceKey);
Task<MultiplePermissionGrantResult> IsGrantedAsync(
ClaimsPrincipal? claimsPrincipal,
string[] names,
string resourceName,
string resourceKey
);
}

1
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs

@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Volo.Abp.Authorization.Permissions.Resources;

1
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs

@ -6,7 +6,6 @@ public interface IResourcePermissionValueProvider
{
string Name { get; }
//TODO: Rename to GetResult? (CheckAsync throws exception by naming convention)
Task<PermissionGrantResult> CheckAsync(ResourcePermissionValueCheckContext context);
Task<MultiplePermissionGrantResult> CheckAsync(ResourcePermissionValuesCheckContext context);

12
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs

@ -1,6 +1,4 @@
using JetBrains.Annotations;
namespace Volo.Abp.Authorization.Permissions.Resources;
namespace Volo.Abp.Authorization.Permissions.Resources;
public class ResourcePermissionGrantInfo : PermissionGrantInfo
{
@ -8,7 +6,13 @@ public class ResourcePermissionGrantInfo : PermissionGrantInfo
public string ResourceKey { get; }
public ResourcePermissionGrantInfo([NotNull] string name, bool isGranted, string resourceName, string resourceKey, string? providerName = null, string? providerKey = null)
public ResourcePermissionGrantInfo(
string name,
bool isGranted,
string resourceName,
string resourceKey,
string? providerName = null,
string? providerKey = null)
: base(name, isGranted, providerName, providerKey)
{
ResourceName = resourceName;

7
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs

@ -1,22 +1,19 @@
using System.Security.Claims;
using JetBrains.Annotations;
namespace Volo.Abp.Authorization.Permissions.Resources;
public class ResourcePermissionValueCheckContext : PermissionValueCheckContext
{
[NotNull]
public string ResourceName { get; }
[NotNull]
public string ResourceKey { get; }
public ResourcePermissionValueCheckContext([NotNull] PermissionDefinition permission, string resourceName, string resourceKey)
public ResourcePermissionValueCheckContext(PermissionDefinition permission, string resourceName, string resourceKey)
: this(permission, null, resourceName, resourceKey)
{
}
public ResourcePermissionValueCheckContext([NotNull] PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey)
public ResourcePermissionValueCheckContext(PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey)
: base(permission, principal)
{
ResourceName = resourceName;

11
framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs

@ -1,38 +1,35 @@
using System.Collections.Generic;
using System.Security.Claims;
using JetBrains.Annotations;
namespace Volo.Abp.Authorization.Permissions.Resources;
public class ResourcePermissionValuesCheckContext : PermissionValuesCheckContext
{
[NotNull]
public string ResourceName { get; }
[NotNull]
public string ResourceKey { get; }
public ResourcePermissionValuesCheckContext([NotNull] PermissionDefinition permission,string resourceName, string resourceKey)
public ResourcePermissionValuesCheckContext(PermissionDefinition permission,string resourceName, string resourceKey)
: this([permission], null, resourceName, resourceKey)
{
}
public ResourcePermissionValuesCheckContext([NotNull] PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey)
public ResourcePermissionValuesCheckContext(PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey)
: this([permission], principal, resourceName, resourceKey)
{
}
public ResourcePermissionValuesCheckContext([NotNull] List<PermissionDefinition> permissions, string resourceName, string resourceKey)
public ResourcePermissionValuesCheckContext(List<PermissionDefinition> permissions, string resourceName, string resourceKey)
: this(permissions, null, resourceName, resourceKey)
{
ResourceName = resourceName;
ResourceKey = resourceKey;
}
public ResourcePermissionValuesCheckContext([NotNull] List<PermissionDefinition> permissions, ClaimsPrincipal? principal, string resourceName, string resourceKey)
public ResourcePermissionValuesCheckContext(List<PermissionDefinition> permissions, ClaimsPrincipal? principal, string resourceName, string resourceKey)
: base(permissions, principal)
{
ResourceName = resourceName;

Loading…
Cancel
Save