From f91d3f64e24371285e46f183ff56e51bef227538 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 22 Aug 2022 12:11:24 -0700 Subject: [PATCH] CanCachePolicy->AllowsCachingPolicies --- .../Core/src/DefaultAuthorizationPolicyProvider.cs | 2 +- .../Authorization/Core/src/IAuthorizationPolicyProvider.cs | 2 +- .../Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt | 4 ++-- .../Authorization/Policy/src/AuthorizationMiddleware.cs | 2 +- .../Authorization/test/AuthorizationMiddlewareTests.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs index d58d883348c0..460d82a0b748 100644 --- a/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs +++ b/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs @@ -76,6 +76,6 @@ public Task GetDefaultPolicyAsync() /// /// Determines if policies from this provider can be cached, which is true only for this type. /// - public virtual bool CanCachePolicy => GetType() == typeof(DefaultAuthorizationPolicyProvider); + public virtual bool AllowsCachingPolicies => GetType() == typeof(DefaultAuthorizationPolicyProvider); #endif } diff --git a/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs index 361256937265..a38c927d88f3 100644 --- a/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs +++ b/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs @@ -33,6 +33,6 @@ public interface IAuthorizationPolicyProvider /// /// Determines if policies from this provider can be cached, defaults to false. /// - bool CanCachePolicy => false; + bool AllowsCachingPolicies => false; #endif } diff --git a/src/Security/Authorization/Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt index 2e9a164e836c..ae0a6aaae037 100644 --- a/src/Security/Authorization/Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt +++ b/src/Security/Authorization/Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt @@ -1,7 +1,7 @@ #nullable enable Microsoft.AspNetCore.Authorization.AuthorizationBuilder Microsoft.AspNetCore.Authorization.AuthorizationBuilder.AuthorizationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void -Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.CanCachePolicy.get -> bool +Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool Microsoft.AspNetCore.Authorization.Infrastructure.PassThroughAuthorizationHandler.PassThroughAuthorizationHandler(Microsoft.Extensions.Options.IOptions! options) -> void static Microsoft.AspNetCore.Authorization.AuthorizationPolicy.CombineAsync(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider! policyProvider, System.Collections.Generic.IEnumerable! authorizeData, System.Collections.Generic.IEnumerable! policies) -> System.Threading.Tasks.Task! virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.AddDefaultPolicy(string! name, Microsoft.AspNetCore.Authorization.AuthorizationPolicy! policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder! @@ -14,4 +14,4 @@ virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.Services.get -> virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetDefaultPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy! policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder! virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetFallbackPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy? policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder! virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetInvokeHandlersAfterFailure(bool invoke) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder! -virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.CanCachePolicy.get -> bool +virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool diff --git a/src/Security/Authorization/Policy/src/AuthorizationMiddleware.cs b/src/Security/Authorization/Policy/src/AuthorizationMiddleware.cs index 2df6ca2e4622..90395ee338d4 100644 --- a/src/Security/Authorization/Policy/src/AuthorizationMiddleware.cs +++ b/src/Security/Authorization/Policy/src/AuthorizationMiddleware.cs @@ -48,7 +48,7 @@ public AuthorizationMiddleware(RequestDelegate next, IAuthorizationPolicyProvide { ArgumentNullException.ThrowIfNull(services); - if (_policyProvider.CanCachePolicy) + if (_policyProvider.AllowsCachingPolicies) { _policyCache = services.GetService(); _canCache = _policyCache != null; diff --git a/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs b/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs index 3907fbd60f73..4fca44704768 100644 --- a/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs +++ b/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs @@ -233,7 +233,7 @@ public async Task OnAuthorizationAsync_WillNotCallPolicyProviderWithCache() .Callback(() => getPolicyCount++); policyProvider.Setup(p => p.GetFallbackPolicyAsync()).ReturnsAsync(policy) .Callback(() => getFallbackPolicyCount++); - policyProvider.Setup(p => p.CanCachePolicy).Returns(true); + policyProvider.Setup(p => p.AllowsCachingPolicies).Returns(true); var next = new TestRequestDelegate(); var endpoint = CreateEndpoint(new AuthorizeAttribute("whatever")); @@ -283,7 +283,7 @@ public override Task GetPolicyAsync(string policyName) return Task.FromResult(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build()); } - public override bool CanCachePolicy => _canCache; + public override bool AllowsCachingPolicies => _canCache; } [Theory]