Skip to content

Commit 0dba0a6

Browse files
committed
Flow HttpContext as resource directly
1 parent 2b13210 commit 0dba0a6

File tree

4 files changed

+5
-25
lines changed

4 files changed

+5
-25
lines changed

src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.netcoreapp.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ public AuthorizationMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, M
99
[System.Diagnostics.DebuggerStepThroughAttribute]
1010
public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; }
1111
}
12-
public partial class AuthorizationMiddlewareContext
13-
{
14-
public AuthorizationMiddlewareContext() { }
15-
public Microsoft.AspNetCore.Http.HttpContext HttpContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
16-
}
1712
public partial interface IAuthorizationMiddlewareResultHandler
1813
{
1914
System.Threading.Tasks.Task HandleAsync(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authorization.AuthorizationPolicy policy, Microsoft.AspNetCore.Authorization.Policy.PolicyAuthorizationResult authorizeResult);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ public async Task Invoke(HttpContext context)
6161
return;
6262
}
6363

64-
// Note that the endpoint will be null if there is no matched endpoint
65-
var authZContext = new AuthorizationMiddlewareContext { HttpContext = context };
66-
67-
var authorizeResult = await policyEvaluator.AuthorizeAsync(policy, authenticateResult, context, resource: authZContext);
64+
var authorizeResult = await policyEvaluator.AuthorizeAsync(policy, authenticateResult, context, resource: context);
6865

6966
var authorizationMiddlewareResultHandler = context.RequestServices.GetRequiredService<IAuthorizationMiddlewareResultHandler>();
7067
await authorizationMiddlewareResultHandler.HandleAsync(_next, context, policy, authorizeResult);

src/Security/Authorization/Policy/src/AuthorizationMiddlewareContext.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Security/Authorization/test/AuthorizationMiddlewareTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ public async Task Invoke_SingleValidClaimShouldSucceed()
317317
public async Task AuthZResourceShouldBeHttpContextAndHaveHEndpoint()
318318
{
319319
// Arrange
320-
AuthorizationMiddlewareContext resource = null;
320+
HttpContext resource = null;
321321
var policy = new AuthorizationPolicyBuilder().RequireAssertion(c =>
322322
{
323-
resource = c.Resource as AuthorizationMiddlewareContext;
323+
resource = c.Resource as HttpContext;
324324
return true;
325325
}).Build();
326326
var policyProvider = new Mock<IAuthorizationPolicyProvider>();
@@ -336,8 +336,8 @@ public async Task AuthZResourceShouldBeHttpContextAndHaveHEndpoint()
336336

337337
// Assert
338338
Assert.NotNull(resource);
339-
Assert.Equal(context, resource.HttpContext);
340-
Assert.Equal(endpoint, resource.HttpContext.GetEndpoint());
339+
Assert.Equal(context, resource);
340+
Assert.Equal(endpoint, resource.GetEndpoint());
341341
}
342342

343343
[Fact]

0 commit comments

Comments
 (0)