diff --git a/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Api.Enduser/Controllers/ClientDelegationController.cs b/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Api.Enduser/Controllers/ClientDelegationController.cs index 15a5f9bdd..59861eb45 100644 --- a/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Api.Enduser/Controllers/ClientDelegationController.cs +++ b/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Api.Enduser/Controllers/ClientDelegationController.cs @@ -119,7 +119,7 @@ public async Task DeleteMyClientViaParty( [HttpGet("clients")] [Authorize(Policy = AuthzConstants.SCOPE_ENDUSER_CLIENTDELEGATION_READ)] [Authorize(Policy = AuthzConstants.POLICY_CLIENTDELEGATION_READ)] - [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] + [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status400BadRequest, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status403Forbidden)] @@ -141,7 +141,7 @@ public async Task GetClients( [HttpGet("agents")] [Authorize(Policy = AuthzConstants.SCOPE_ENDUSER_CLIENTDELEGATION_READ)] [Authorize(Policy = AuthzConstants.POLICY_CLIENTDELEGATION_READ)] - [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] + [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status400BadRequest, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status403Forbidden)] @@ -224,7 +224,7 @@ public async Task RemoveAgent( [HttpGet("agents/accesspackages")] [Authorize(Policy = AuthzConstants.SCOPE_ENDUSER_CLIENTDELEGATION_READ)] [Authorize(Policy = AuthzConstants.POLICY_CLIENTDELEGATION_READ)] - [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] + [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status400BadRequest, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status403Forbidden)] @@ -245,7 +245,7 @@ public async Task GetDelegatedAccessPackagesToAgentsViaPartyAsync [HttpGet("clients/accesspackages")] [Authorize(Policy = AuthzConstants.SCOPE_ENDUSER_CLIENTDELEGATION_READ)] [Authorize(Policy = AuthzConstants.POLICY_CLIENTDELEGATION_READ)] - [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] + [ProducesResponseType>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status400BadRequest, MediaTypeNames.Application.Json)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status403Forbidden)] diff --git a/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/ClientDto.cs b/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/_ClientDto.cs similarity index 92% rename from src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/ClientDto.cs rename to src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/_ClientDto.cs index 619edc4cd..3e091d7dd 100644 --- a/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/ClientDto.cs +++ b/src/apps/Altinn.AccessManagement/src/Altinn.AccessManagement.Core/Models/_ClientDto.cs @@ -1,15 +1,16 @@ -namespace Altinn.AccessManagement.Core.Models; +namespace Altinn.AccessManagement.Core.Models; /// /// Model representing a connected client party, meaning a party which has been authorized for one or more accesses, either directly or through role(s), access packages, resources or resource instances. /// Model can be used both to represent a connection received from another party or a connection provided to another party. /// -public class ClientDto +[Obsolete("new client DTO in contracts")] +public class _ClientDto { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public ClientDto() + public _ClientDto() { } diff --git a/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/AssignmentService.cs b/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/AssignmentService.cs index 1848307ae..ef4d2bf07 100644 --- a/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/AssignmentService.cs +++ b/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/AssignmentService.cs @@ -27,7 +27,7 @@ IDelegationRepository delegationRepository private static readonly Guid PartyTypeOrganizationUuid = new Guid("8c216e2f-afdd-4234-9ba2-691c727bb33d"); /// - public async Task> GetClients(Guid toId, string[] roles, string[] packages, CancellationToken cancellationToken = default) + public async Task> GetClients(Guid toId, string[] roles, string[] packages, CancellationToken cancellationToken = default) { // Fetch role metadata var roleFilter = roleRepository.CreateFilterBuilder(); @@ -80,9 +80,9 @@ public async Task> GetClients(Guid toId, string[] roles, return await GetFilteredClientsFromAssignments(clients, assignmentPackageResult, roleResult, packageResult, rolePackageResult, packages, cancellationToken); } - private async Task> GetFilteredClientsFromAssignments(IEnumerable assignments, IEnumerable assignmentPackages, QueryResponse roles, QueryResponse packages, QueryResponse rolePackages, string[] filterPackages, CancellationToken ct) + private async Task> GetFilteredClientsFromAssignments(IEnumerable assignments, IEnumerable assignmentPackages, QueryResponse roles, QueryResponse packages, QueryResponse rolePackages, string[] filterPackages, CancellationToken ct) { - Dictionary clients = new(); + Dictionary clients = new(); // Fetch Entity metadata var entityVariants = await entityVariantRepository.Get(cancellationToken: ct); @@ -102,11 +102,11 @@ private async Task> GetFilteredClientsFromAssignments(IEnumerabl } // Add client to dictionary if not already present - if (!clients.TryGetValue(assignment.FromId, out ClientDto client)) + if (!clients.TryGetValue(assignment.FromId, out _ClientDto client)) { - client = new ClientDto() + client = new _ClientDto() { - Party = new ClientDto.ClientParty + Party = new _ClientDto.ClientParty { Id = assignment.FromId, Name = assignment.From.Name, @@ -121,7 +121,7 @@ private async Task> GetFilteredClientsFromAssignments(IEnumerabl // Add packages client has been assigned if (assignmentPackageNames.Length > 0) { - client.Access.Add(new ClientDto.ClientRoleAccessPackages + client.Access.Add(new _ClientDto.ClientRoleAccessPackages { Role = roleName, Packages = assignmentPackageNames @@ -131,7 +131,7 @@ private async Task> GetFilteredClientsFromAssignments(IEnumerabl // Add packages client has through role if (rolePackageNames.Length > 0) { - client.Access.Add(new ClientDto.ClientRoleAccessPackages + client.Access.Add(new _ClientDto.ClientRoleAccessPackages { Role = roleName, Packages = rolePackageNames @@ -140,7 +140,7 @@ private async Task> GetFilteredClientsFromAssignments(IEnumerabl } // Return only clients having all required filterpackages - List result = new(); + List<_ClientDto> result = new(); foreach (var client in clients.Keys) { var allClientPackages = clients[client].Access.SelectMany(rp => rp.Packages).Distinct(); diff --git a/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/Contracts/IAssignmentService.cs b/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/Contracts/IAssignmentService.cs index 8f88e83a1..28bdbd336 100644 --- a/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/Contracts/IAssignmentService.cs +++ b/src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Persistence/Services/Contracts/IAssignmentService.cs @@ -83,7 +83,7 @@ public interface IAssignmentService /// Fetches Client assignments. /// /// - Task> GetClients(Guid toId, string[] roles, string[] packages, CancellationToken cancellationToken = default); + Task> GetClients(Guid toId, string[] roles, string[] packages, CancellationToken cancellationToken = default); /// /// Fetches all assignment packages or role packages for a given assignments.