chore: add cancellation tokens to pep

martinothamar · martinothamar · commit 082e413dec0e · 2025-11-17T11:53:15.000+01:00
diff --git a/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PdpDenyMock.cs b/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PdpDenyMock.cs
@@ -10,7 +10,7 @@ namespace Altinn.AccessManagement.Tests.Mocks
     internal class PdpDenyMock : IPDP
     {
         /// <inheritdoc/>
-        public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)
+        public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)
         {
             var response = new XacmlJsonResponse
             {
@@ -21,7 +21,7 @@ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJ
         }
 
         /// <inheritdoc/>
-        public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)
+        public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)
         {
             return Task.FromResult(false);
         }
diff --git a/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PdpPermitMock.cs b/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PdpPermitMock.cs
@@ -12,7 +12,7 @@ namespace Altinn.AccessManagement.Tests.Mocks;
 public class PdpPermitMock: IPDP
 {
     /// <inheritdoc/>
-    public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)
+    public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)
     {
         var response = new XacmlJsonResponse
         {
@@ -23,7 +23,7 @@ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJ
     }
 
     /// <inheritdoc/>
-    public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)
+    public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)
     {
         return Task.FromResult(true);
     }
diff --git a/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PepWithPDPAuthorizationMock.cs b/src/apps/Altinn.AccessManagement/test/AccessMgmt.Tests/Mocks/PepWithPDPAuthorizationMock.cs
@@ -37,7 +37,7 @@ public class PepWithPDPAuthorizationMock : IPDP
         private const string PartyAttributeId = "urn:altinn:partyid";
 
         /// <inheritdoc />
-        public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)
+        public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)
         {
             return await Authorize(xacmlJsonRequest.Request);
         }
@@ -125,9 +125,9 @@ private async Task<XacmlContextResponse> Authorize(XacmlContextRequest decisionR
         }
 
         /// <inheritdoc/>
-        public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)
+        public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)
         {
-            XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest);
+            XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest, cancellationToken);
             return DecisionHelper.ValidatePdpDecision(response.Response, user);
         }
 
diff --git a/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Authorization/AppAccessHandler.cs b/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Authorization/AppAccessHandler.cs
@@ -49,7 +49,7 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext
 
             XacmlJsonRequestRoot request = DecisionHelper.CreateDecisionRequest(context, requirement, _httpContextAccessor.HttpContext.GetRouteData());
 
-            XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request);
+            XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request, httpContext.RequestAborted);
 
             if (response?.Response == null)
             {
diff --git a/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Authorization/ResourceAccessHandler.cs b/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Authorization/ResourceAccessHandler.cs
@@ -51,7 +51,7 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext
 
             XacmlJsonRequestRoot request = DecisionHelper.CreateDecisionRequest(context, requirement, _httpContextAccessor.HttpContext.GetRouteData(), _httpContextAccessor.HttpContext.Request.Headers);
 
-            XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request);
+            XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request, httpContext.RequestAborted);
 
             if (response?.Response == null)
             {
diff --git a/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Clients/AuthorizationApiClient.cs b/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Clients/AuthorizationApiClient.cs
@@ -56,8 +56,9 @@ public AuthorizationApiClient(
         /// Method for performing authorization.
         /// </summary>
         /// <param name="xacmlJsonRequest">An authorization request.</param>
+        /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The result of the authorization request.</returns>
-        public async Task<XacmlJsonResponse> AuthorizeRequest(XacmlJsonRequestRoot xacmlJsonRequest)
+        public async Task<XacmlJsonResponse> AuthorizeRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)
         {
             XacmlJsonResponse xacmlJsonResponse = null;
             string apiUrl = $"decision";
@@ -66,19 +67,19 @@ public async Task<XacmlJsonResponse> AuthorizeRequest(XacmlJsonRequestRoot xacml
 
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            HttpResponseMessage response = await _httpClient.PostAsync(apiUrl, httpContent);
+            HttpResponseMessage response = await _httpClient.PostAsync(apiUrl, httpContent, cancellationToken);
             stopWatch.Stop();
             TimeSpan ts = stopWatch.Elapsed;
             _logger.LogInformation("Authorization PDP time elapsed: " + ts.TotalMilliseconds);
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
-                xacmlJsonResponse = await response.Content.ReadFromJsonAsync<XacmlJsonResponse>(jsonOptions);
+                xacmlJsonResponse = await response.Content.ReadFromJsonAsync<XacmlJsonResponse>(jsonOptions, cancellationToken);
             }
             else
             {
                 _logger.LogInformation($"// PDPAppSI // GetDecisionForRequest // Non-zero status code: {response.StatusCode}");
-                _logger.LogInformation($"// PDPAppSI // GetDecisionForRequest // Response: {await response.Content.ReadAsStringAsync()}");
+                _logger.LogInformation($"// PDPAppSI // GetDecisionForRequest // Response: {await response.Content.ReadAsStringAsync(cancellationToken)}");
             }
 
             return xacmlJsonResponse;
diff --git a/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Implementation/PDPAppSI.cs b/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Implementation/PDPAppSI.cs
@@ -28,13 +28,13 @@ public PDPAppSI(ILogger<PDPAppSI> logger, AuthorizationApiClient authorizationAp
         }
 
         /// <inheritdoc/>
-        public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)
+        public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)
         {
             XacmlJsonResponse xacmlJsonResponse = null;
 
             try
             {
-                xacmlJsonResponse = await _authorizationApiClient.AuthorizeRequest(xacmlJsonRequest);
+                xacmlJsonResponse = await _authorizationApiClient.AuthorizeRequest(xacmlJsonRequest, cancellationToken);
             }
             catch (Exception e)
             {
@@ -45,9 +45,9 @@ public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot
         }
 
         /// <inheritdoc/>
-        public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)
+        public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)
         {
-            XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest);
+            XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest, cancellationToken);
 
             if (response?.Response == null)
             {
diff --git a/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Interfaces/IPDP.cs b/src/pkgs/Altinn.Authorization.PEP/src/Altinn.Authorization.PEP/Interfaces/IPDP.cs
@@ -14,15 +14,17 @@ public interface IPDP
         /// Sends in a request and get response with result of the request
         /// </summary>
         /// <param name="xacmlJsonRequest">The Xacml Json Request</param>
+        /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The Xacml Json response contains the result of the request</returns>
-        Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest);
+        Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Change this to a better one???????
         /// </summary>
         /// <param name="xacmlJsonRequest">The Xacml Json Request</param>
         /// <param name="user">The claims principal</param>
+        /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Returns true if request is permitted and false if not</returns>
-        Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user);
+        Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/pkgs/Altinn.Authorization.PEP/test/Altinn.Authorization.PEP.Tests/AppAccessHandlerTest.cs b/src/pkgs/Altinn.Authorization.PEP/test/Altinn.Authorization.PEP.Tests/AppAccessHandlerTest.cs
@@ -41,7 +41,7 @@ public async Task HandleRequirementAsync_TC01Async()
             AuthorizationHandlerContext context = CreateAuthorizationHandlerContext();
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Permit.ToString());
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -62,7 +62,7 @@ public async Task HandleRequirementAsync_TC02Async()
             AuthorizationHandlerContext context = CreateAuthorizationHandlerContext();
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Deny.ToString());
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -86,7 +86,7 @@ public async Task HandleRequirementAsync_TC03Async()
 
             // Add extra result
             response.Response.Add(new XacmlJsonResult());
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -108,7 +108,7 @@ public async Task HandleRequirementAsync_TC04Async()
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Permit.ToString());
             AddObligationWithMinAuthLv(response, "2");
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -130,7 +130,7 @@ public async Task HandleRequirementAsync_TC05Async()
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Permit.ToString());
             AddObligationWithMinAuthLv(response, "3");
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -151,7 +151,7 @@ public async Task HandleRequirementAsync_TC06Async()
             AuthorizationHandlerContext context = CreateAuthorizationHandlerContext();
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = null;
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act & Assert
             await Assert.ThrowsAsync<ArgumentNullException>(() => _aah.HandleAsync(context));
@@ -171,7 +171,7 @@ public async Task HandleRequirementAsync_TC07Async()
             // Create response with a result list that is null
             XacmlJsonResponse response = new XacmlJsonResponse();
             response.Response = null;
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act & Assert
             await Assert.ThrowsAsync<ArgumentNullException>(() => _aah.HandleAsync(context));
@@ -192,7 +192,7 @@ public async Task HandleRequirementAsync_TC08Async()
             AddObligationWithMinAuthLv(response, "2");
 
             // verify
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -209,7 +209,7 @@ public async Task HandleRequirementAsync_TC09Async()
             AuthorizationHandlerContext context = CreateAuthorizationHandlerContextSystemUser();
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Permit.ToString());
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
@@ -230,7 +230,7 @@ public async Task HandleRequirementAsync_TC10Async()
             AuthorizationHandlerContext context = CreateAuthorizationHandlerContextAppUser("app_skd_flyttemelding");
             _httpContextAccessorMock.Setup(h => h.HttpContext).Returns(CreateHttpContext());
             XacmlJsonResponse response = CreateResponse(XacmlContextDecision.Permit.ToString());
-            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>())).Returns(Task.FromResult(response));
+            _pdpMock.Setup(a => a.GetDecisionForRequest(It.IsAny<XacmlJsonRequestRoot>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             // Act
             await _aah.HandleAsync(context);
diff --git a/src/pkgs/Altinn.Authorization.PEP/test/Altinn.Authorization.PEP.Tests/ResourceAccessHandlerTest.cs b/src/pkgs/Altinn.Authorization.PEP/test/Altinn.Authorization.PEP.Tests/ResourceAccessHandlerTest.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Altinn.AccessManagement.Tests.Mocks`
`10`	`10`	`internal class PdpDenyMock : IPDP`
`11`	`11`	`{`
`12`	`12`	`/// <inheritdoc/>`
`13`		`- public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)`
	`13`	`+ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)`
`14`	`14`	`{`
`15`	`15`	`var response = new XacmlJsonResponse`
`16`	`16`	`{`
`@@ -21,7 +21,7 @@ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJ`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/// <inheritdoc/>`
`24`		`- public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)`
	`24`	`+ public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)`
`25`	`25`	`{`
`26`	`26`	`return Task.FromResult(false);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Altinn.AccessManagement.Tests.Mocks;`
`12`	`12`	`public class PdpPermitMock: IPDP`
`13`	`13`	`{`
`14`	`14`	`/// <inheritdoc/>`
`15`		`- public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)`
	`15`	`+ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)`
`16`	`16`	`{`
`17`	`17`	`var response = new XacmlJsonResponse`
`18`	`18`	`{`
`@@ -23,7 +23,7 @@ public Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJ`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// <inheritdoc/>`
`26`		`- public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)`
	`26`	`+ public Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)`
`27`	`27`	`{`
`28`	`28`	`return Task.FromResult(true);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class PepWithPDPAuthorizationMock : IPDP`
`37`	`37`	`private const string PartyAttributeId = "urn:altinn:partyid";`
`38`	`38`
`39`	`39`	`/// <inheritdoc />`
`40`		`- public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)`
	`40`	`+ public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)`
`41`	`41`	`{`
`42`	`42`	`return await Authorize(xacmlJsonRequest.Request);`
`43`	`43`	`}`
`@@ -125,9 +125,9 @@ private async Task<XacmlContextResponse> Authorize(XacmlContextRequest decisionR`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/// <inheritdoc/>`
`128`		`- public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)`
	`128`	`+ public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)`
`129`	`129`	`{`
`130`		`- XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest);`
	`130`	`+ XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest, cancellationToken);`
`131`	`131`	`return DecisionHelper.ValidatePdpDecision(response.Response, user);`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext`
`49`	`49`
`50`	`50`	`XacmlJsonRequestRoot request = DecisionHelper.CreateDecisionRequest(context, requirement, _httpContextAccessor.HttpContext.GetRouteData());`
`51`	`51`
`52`		`- XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request);`
	`52`	`+ XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request, httpContext.RequestAborted);`
`53`	`53`
`54`	`54`	`if (response?.Response == null)`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext`
`51`	`51`
`52`	`52`	`XacmlJsonRequestRoot request = DecisionHelper.CreateDecisionRequest(context, requirement, _httpContextAccessor.HttpContext.GetRouteData(), _httpContextAccessor.HttpContext.Request.Headers);`
`53`	`53`
`54`		`- XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request);`
	`54`	`+ XacmlJsonResponse response = await _pdp.GetDecisionForRequest(request, httpContext.RequestAborted);`
`55`	`55`
`56`	`56`	`if (response?.Response == null)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ public PDPAppSI(ILogger<PDPAppSI> logger, AuthorizationApiClient authorizationAp`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/// <inheritdoc/>`
`31`		`- public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest)`
	`31`	`+ public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot xacmlJsonRequest, CancellationToken cancellationToken = default)`
`32`	`32`	`{`
`33`	`33`	`XacmlJsonResponse xacmlJsonResponse = null;`
`34`	`34`
`35`	`35`	`try`
`36`	`36`	`{`
`37`		`- xacmlJsonResponse = await _authorizationApiClient.AuthorizeRequest(xacmlJsonRequest);`
	`37`	`+ xacmlJsonResponse = await _authorizationApiClient.AuthorizeRequest(xacmlJsonRequest, cancellationToken);`
`38`	`38`	`}`
`39`	`39`	`catch (Exception e)`
`40`	`40`	`{`
`@@ -45,9 +45,9 @@ public async Task<XacmlJsonResponse> GetDecisionForRequest(XacmlJsonRequestRoot`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/// <inheritdoc/>`
`48`		`- public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user)`
	`48`	`+ public async Task<bool> GetDecisionForUnvalidateRequest(XacmlJsonRequestRoot xacmlJsonRequest, ClaimsPrincipal user, CancellationToken cancellationToken = default)`
`49`	`49`	`{`
`50`		`- XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest);`
	`50`	`+ XacmlJsonResponse response = await GetDecisionForRequest(xacmlJsonRequest, cancellationToken);`
`51`	`51`
`52`	`52`	`if (response?.Response == null)`
`53`	`53`	`{`