Skip to content

Commit 60dae83

Browse files
committed
Merge in 'release/7.0-rc1' changes
2 parents 9d21592 + 63fb7a8 commit 60dae83

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
7676
/// <summary>
7777
/// Determines if policies from this provider can be cached, which is true only for this type.
7878
/// </summary>
79-
public virtual bool CanCachePolicy => GetType() == typeof(DefaultAuthorizationPolicyProvider);
79+
public virtual bool AllowsCachingPolicies => GetType() == typeof(DefaultAuthorizationPolicyProvider);
8080
#endif
8181
}

src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public interface IAuthorizationPolicyProvider
3333
/// <summary>
3434
/// Determines if policies from this provider can be cached, defaults to false.
3535
/// </summary>
36-
bool CanCachePolicy => false;
36+
bool AllowsCachingPolicies => false;
3737
#endif
3838
}

src/Security/Authorization/Core/src/PublicAPI/net7.0/PublicAPI.Unshipped.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#nullable enable
22
Microsoft.AspNetCore.Authorization.AuthorizationBuilder
33
Microsoft.AspNetCore.Authorization.AuthorizationBuilder.AuthorizationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
4-
Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.CanCachePolicy.get -> bool
4+
Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool
55
Microsoft.AspNetCore.Authorization.Infrastructure.PassThroughAuthorizationHandler.PassThroughAuthorizationHandler(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Authorization.AuthorizationOptions!>! options) -> void
66
static Microsoft.AspNetCore.Authorization.AuthorizationPolicy.CombineAsync(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider! policyProvider, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.IAuthorizeData!>! authorizeData, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.AuthorizationPolicy!>! policies) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Authorization.AuthorizationPolicy?>!
77
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 ->
1414
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetDefaultPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy! policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
1515
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetFallbackPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy? policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
1616
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetInvokeHandlersAfterFailure(bool invoke) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
17-
virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.CanCachePolicy.get -> bool
17+
virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool

src/Security/Authorization/Policy/src/AuthorizationMiddleware.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public AuthorizationMiddleware(RequestDelegate next, IAuthorizationPolicyProvide
4848
{
4949
ArgumentNullException.ThrowIfNull(services);
5050

51-
if (_policyProvider.CanCachePolicy)
51+
if (_policyProvider.AllowsCachingPolicies)
5252
{
5353
_policyCache = services.GetService<AuthorizationPolicyCache>();
5454
_canCache = _policyCache != null;

src/Security/Authorization/test/AuthorizationMiddlewareTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public async Task OnAuthorizationAsync_WillNotCallPolicyProviderWithCache()
233233
.Callback(() => getPolicyCount++);
234234
policyProvider.Setup(p => p.GetFallbackPolicyAsync()).ReturnsAsync(policy)
235235
.Callback(() => getFallbackPolicyCount++);
236-
policyProvider.Setup(p => p.CanCachePolicy).Returns(true);
236+
policyProvider.Setup(p => p.AllowsCachingPolicies).Returns(true);
237237
var next = new TestRequestDelegate();
238238

239239
var endpoint = CreateEndpoint(new AuthorizeAttribute("whatever"));
@@ -283,7 +283,7 @@ public override Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
283283
return Task.FromResult(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build());
284284
}
285285

286-
public override bool CanCachePolicy => _canCache;
286+
public override bool AllowsCachingPolicies => _canCache;
287287
}
288288

289289
[Theory]

0 commit comments

Comments
 (0)