debug

src/Altinn.AccessManagement.Core/Services/Interfaces/ISingleRightsService.cs

@@ -24,7 +24,7 @@ public interface ISingleRightsService
         /// <param name="authenticatedUserAuthlevel">The authentication level of the authenticated user performing the delegation</param>
         /// <param name="delegation">The delegation</param>
         /// <returns>The result of the delegation</returns>
-        public Task<DelegationActionResult> DelegateRights(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation);
+        public Task<DelegationActionResult> DelegateRights(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets all offered single rights delegations for a reportee

src/Altinn.AccessManagement.Core/Services/SingleRightsService.cs

@@ -104,7 +104,7 @@ public async Task<DelegationCheckResponse> RightsDelegationCheck(int authenticat
         }
 
         /// <inheritdoc/>
-        public async Task<DelegationActionResult> DelegateRights(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation)
+        public async Task<DelegationActionResult> DelegateRights(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation, CancellationToken cancellationToken = default)
         {
             (DelegationActionResult result, ServiceResource resource, Party fromParty, List<AttributeMatch> to) = await ValidateDelegationLookupModel(DelegationActionType.Delegation, delegation, authenticatedUserId);
             if (!result.IsValid)
@@ -125,7 +125,7 @@ public async Task<DelegationActionResult> DelegateRights(int authenticatedUserId
 
             // Verify authenticated users delegable rights
             RightsQuery rightsQuery = RightsHelper.GetRightsQuery(authenticatedUserId, fromParty.PartyId, resourceRegistryId, org, app);
-            List<Right> usersDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true);
+            List<Right> usersDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true, cancellationToken: cancellationToken);
             if (usersDelegableRights == null || usersDelegableRights.Count == 0)
             {
                 result.Errors.Add("right[0].Resource", $"Authenticated user does not have any delegable rights for the resource: {resourceRegistryId}");
@@ -187,7 +187,7 @@ public async Task<ValidationProblemDetails> RevokeRightsDelegation(int authentic
             {
                 return assertion;
             }
-            
+
             var fromAttribute = await _resolver.Resolve(delegation.From, [AltinnXacmlConstants.MatchAttributeIdentifiers.PartyAttribute], cancellationToken);
             var toAttribute = await _resolver.Resolve(delegation.To, Urn.Altinn2InternalIds, cancellationToken);
 
@@ -395,7 +395,7 @@ private ValidationProblemDetails AssertRevokeDelegationInput(DelegationLookup de
             else if (DelegationHelper.TryGetSingleAttributeMatchValue(delegation.To, AltinnXacmlConstants.MatchAttributeIdentifiers.SystemUserUuid, out string toSystemUserUuidAttrValue))
             {
                 toSystemUser = await _contextRetrievalService.GetSystemUserById(fromParty.PartyId, toSystemUserUuidAttrValue);
-                
+
                 if (toSystemUser == null)
                 {
                     result.Errors.Add("To", $"The provided To attribute value could not be found as a valid systemuser.");
@@ -421,14 +421,14 @@ private ValidationProblemDetails AssertRevokeDelegationInput(DelegationLookup de
                 result.Errors.Add("To", $"A distinct recipient party for the delegation, could not be identified by the supplied attributes. A recipient can be identified by either a single {AltinnXacmlConstants.MatchAttributeIdentifiers.OrganizationNumberAttribute} or {AltinnXacmlConstants.MatchAttributeIdentifiers.EnterpriseUserName} attribute, or a combination of {AltinnXacmlConstants.MatchAttributeIdentifiers.PersonId} and {AltinnXacmlConstants.MatchAttributeIdentifiers.PersonLastName} attributes, {AltinnXacmlConstants.MatchAttributeIdentifiers.PersonUserName} and {AltinnXacmlConstants.MatchAttributeIdentifiers.PersonLastName} attributes or {AltinnXacmlConstants.MatchAttributeIdentifiers.SystemUserUuid} attribute.");
                 return (result, resource, null, null);
             }
-            
+
             // Verify delegation From and To is not the same party (with exception for Altinn 2 Enterprise users)
             if (fromParty.PartyId == toParty?.PartyId || (toUser != null && fromParty.PartyId == toUser.PartyId && toUser.Party.PartyTypeName != PartyType.Organisation))
             {
                 result.Errors.Add("To", $"The From party and the To recipient are the same. Self-delegation is not supported as it serves no purpose.");
                 return (result, resource, null, null);
             }
-            
+
             // Build To AttributeMatch to be used for the delegation rules
             List<AttributeMatch> to = new List<AttributeMatch>();
             if (toParty != null)

src/Altinn.AccessManagement/Controllers/RightsInternalController.cs

@@ -178,6 +178,7 @@ public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> Delega
         /// </summary>
         /// <param name="party">The reportee party</param>
         /// <param name="rightsDelegationRequest">Request model for rights delegation</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <response code="200" cref="List{RightDelegationStatusExternal}">Ok</response>
         /// <response code="400">Bad Request</response>
         /// <response code="401">Unauthorized</response>
@@ -194,7 +195,7 @@ public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> Delega
         [ProducesResponseType(403)]
         [ProducesResponseType(500)]
         [FeatureGate(FeatureFlags.RightsDelegationApi)]
-        public async Task<ActionResult<RightsDelegationResponseExternal>> Delegation([FromRoute] string party, [FromBody] RightsDelegationRequestExternal rightsDelegationRequest)
+        public async Task<ActionResult<RightsDelegationResponseExternal>> Delegation([FromRoute] string party, [FromBody] RightsDelegationRequestExternal rightsDelegationRequest, CancellationToken cancellationToken)
         {
             int authenticatedUserId = AuthenticationHelper.GetUserId(HttpContext);
             int authenticationLevel = AuthenticationHelper.GetUserAuthenticationLevel(HttpContext);
@@ -206,7 +207,7 @@ public async Task<ActionResult<RightsDelegationResponseExternal>> Delegation([Fr
                 DelegationLookup rightsDelegationRequestInternal = _mapper.Map<DelegationLookup>(rightsDelegationRequest);
                 rightsDelegationRequestInternal.From = reportee.SingleToList();
 
-                DelegationActionResult delegationResultInternal = await _rights.DelegateRights(authenticatedUserId, authenticationLevel, rightsDelegationRequestInternal);
+                DelegationActionResult delegationResultInternal = await _rights.DelegateRights(authenticatedUserId, authenticationLevel, rightsDelegationRequestInternal, cancellationToken);
                 if (!delegationResultInternal.IsValid)
                 {
                     foreach (var error in delegationResultInternal.Errors)
@@ -418,4 +419,4 @@ public async Task<IActionResult> ClearAccessCache([FromRoute] int party, [FromBo
             return Ok();
         }
     }
-}
+}

test/Altinn.AccessManagement.Tests/Controllers/RightsInternalControllerTest.cs

@@ -1632,4 +1632,4 @@ private static StreamContent GetRightsDelegationContent(string resourceId, strin
             return content;
         }
     }
-}
+}

test/Altinn.AccessManagement.Tests/CustomWebApplicationFactory.cs

@@ -28,6 +28,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             builder.ConfigureLogging((ctx, logging) =>
             {
                 logging.ClearProviders();
+                logging.AddConsole();
             });
         }
     }

test/Altinn.AccessManagement.Tests/Mocks/AltinnRolesClientMock.cs

@@ -26,7 +26,7 @@ public AltinnRolesClientMock()
     }
 
     /// <inheritdoc/>
-    public async Task<List<Role>> GetDecisionPointRolesForUser(int coveredByUserId, int offeredByPartyId, CancellationToken cancellationToken)
+    public async Task<List<Role>> GetDecisionPointRolesForUser(int coveredByUserId, int offeredByPartyId, CancellationToken cancellationToken = default)
     {
         List<Role> roles = new List<Role>();
         string rolesPath = GetRolesPath(coveredByUserId, offeredByPartyId);
@@ -40,7 +40,7 @@ public async Task<List<Role>> GetDecisionPointRolesForUser(int coveredByUserId,
     }
 
     /// <inheritdoc/>
-    public async Task<List<Role>> GetRolesForDelegation(int coveredByUserId, int offeredByPartyId, CancellationToken cancellationToken)
+    public async Task<List<Role>> GetRolesForDelegation(int coveredByUserId, int offeredByPartyId, CancellationToken cancellationToken = default)
     {
         List<Role> roles = new List<Role>();
         string rolesPath = GetRolesForDelegationPath(coveredByUserId, offeredByPartyId);
@@ -54,12 +54,12 @@ public async Task<List<Role>> GetRolesForDelegation(int coveredByUserId, int off
     }
 
     /// <inheritdoc/>
-    public async Task<List<AuthorizedParty>> GetAuthorizedPartiesWithRoles(int userId, CancellationToken cancellationToken)
+    public async Task<List<AuthorizedParty>> GetAuthorizedPartiesWithRoles(int userId, CancellationToken cancellationToken = default)
     {
         string authorizedPartiesPath = GetAltinn2AuthorizedPartiesWithRolesPath(userId);
         if (File.Exists(authorizedPartiesPath))
         {
-            string content = await File.ReadAllTextAsync(authorizedPartiesPath, cancellationToken);
+            string content = await File.ReadAllTextAsync(authorizedPartiesPath);
             List<SblAuthorizedParty> bridgeAuthParties = (List<SblAuthorizedParty>)JsonSerializer.Deserialize(content, typeof(List<SblAuthorizedParty>), jsonOptions);
             return bridgeAuthParties.Select(sblAuthorizedParty => new AuthorizedParty(sblAuthorizedParty)).ToList();
         }

test/Altinn.AccessManagement.Tests/Mocks/PepWithPDPAuthorizationMock.cs

@@ -445,4 +445,4 @@ private Instance GetTestInstance(string instanceId)
     }
 
 #pragma warning restore SA1600 // ElementsMustBeDocumented
-}
+}

test/Altinn.AccessManagement.Tests/Mocks/PolicyFactoryMock.cs

@@ -7,15 +7,17 @@ namespace Altinn.AccessManagement.Tests.Mocks;
 /// <inheritdoc/>
 public class PolicyFactoryMock(ILogger<PolicyRepositoryMock> logger) : IPolicyFactory
 {
+    private ILogger<PolicyRepositoryMock> Logger { get; } = logger;
+
     /// <inheritdoc/>
     public IPolicyRepository Create(PolicyAccountType account, string filepath)
     {
-        return new PolicyRepositoryMock(filepath, logger);
+        return new PolicyRepositoryMock(filepath, Logger);
     }
 
     /// <inheritdoc/>
     public IPolicyRepository Create(string filepath)
     {
-        return new PolicyRepositoryMock(filepath, logger);
+        return new PolicyRepositoryMock(filepath, Logger);
     }
 }

test/Altinn.AccessManagement.Tests/Mocks/PolicyRepositoryMock.cs

@@ -90,7 +90,6 @@ public Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = defaul
         private static string GetDataOutputBlobPath()
         {
             return Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Data", "blobs", "output");
-
         }
 
         private static string GetDataInputBlobPath()
@@ -140,4 +139,4 @@ private static async Task<Response<BlobContentInfo>> WriteStreamToTestDataFolder
             return mockResponse.Object;
         }
     }
-}
+}

test/Altinn.AccessManagement.Tests/Utils/TestDataUtil.cs

@@ -540,11 +540,5 @@ private static string GetPartiesPath()
             string unitTestFolder = Path.GetDirectoryName(new Uri(typeof(PartiesClientMock).Assembly.Location).LocalPath);
             return Path.Combine(unitTestFolder, "Data", "Parties");
         }
-
-        private static string GetResourcesPath()
-        {
-            string unitTestFolder = Path.GetDirectoryName(new Uri(typeof(DelegationsControllerTest).Assembly.Location).LocalPath);
-            return Path.Combine(unitTestFolder, "..", "..", "..", "Data", "Resources");
-        }
     }
-}
+}