Browse Source

Change namespace.

pull/272/head
Halil İbrahim Kalkan 9 years ago
parent
commit
0afd0d0c25
  1. 11
      src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs
  2. 19
      src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs

11
src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationServiceExtensions.cs → src/Volo.Abp.Authorization/Microsoft/AspNetCore/Authorization/AbpAuthorizationServiceExtensions.cs

@ -1,15 +1,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization; using Volo.Abp;
using Volo.Abp.Authorization;
namespace Volo.Abp.Authorization namespace Microsoft.AspNetCore.Authorization
{ {
public static class AbpAuthorizationServiceExtensions public static class AbpAuthorizationServiceExtensions
{ {
public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService authorizationService, string policyName) public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService authorizationService, string policyName)
{ {
return authorizationService.AuthorizeAsync( return AuthorizeAsync(authorizationService, authorizationService.AsAbpAuthorizationService().CurrentPrincipal,
authorizationService.AsAbpAuthorizationService().CurrentPrincipal,
policyName policyName
); );
} }
@ -34,8 +34,7 @@ namespace Volo.Abp.Authorization
public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService authorizationService, AuthorizationPolicy policy) public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService authorizationService, AuthorizationPolicy policy)
{ {
return authorizationService.AuthorizeAsync( return AuthorizeAsync(authorizationService, authorizationService.AsAbpAuthorizationService().CurrentPrincipal,
authorizationService.AsAbpAuthorizationService().CurrentPrincipal,
policy policy
); );
} }

19
src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs

@ -25,17 +25,22 @@ namespace Volo.Abp.Authorization
public override async Task<AuthorizationPolicy> GetPolicyAsync(string policyName) public override async Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
{ {
var permission = _permissionDefinitionManager.GetOrNull(policyName); var policy = await base.GetPolicyAsync(policyName);
if (policy != null)
{
return policy;
}
if (permission == null) var permission = _permissionDefinitionManager.GetOrNull(policyName);
if (permission != null)
{ {
return await base.GetPolicyAsync(policyName); //TODO: Optimize & Cache!
var policyBuilder = new AuthorizationPolicyBuilder(Array.Empty<string>());
policyBuilder.Requirements.Add(new PermissionRequirement(policyName));
return policyBuilder.Build();
} }
//TODO: Optimize & Cache! return null;
var policyBuilder = new AuthorizationPolicyBuilder(Array.Empty<string>());
policyBuilder.Requirements.Add(new PermissionRequirement(policyName));
return policyBuilder.Build();
} }
public Task<List<string>> GetPoliciesNamesAsync() public Task<List<string>> GetPoliciesNamesAsync()

Loading…
Cancel
Save