Sr integration test2 (#141)

* get partyId from context instead of header

* changed SystemUserDescriptor to reflect recent design changes

* New API endpoint for Default Rights

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/DefaultRightsDTO.cs

@@ -0,0 +1,8 @@
+namespace Altinn.Authentication.UI.Core.SystemRegister
+{
+    public class DefaultRightsDTO
+    {
+        public string Right { get; set; } = string.Empty;
+        public string ServiceProvider { get; set; } = string.Empty;
+    }
+}

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemUsers/SystemUserDescriptor.cs

@@ -11,12 +11,6 @@ public class SystemUserDescriptor
     /// </summary>
     public string? IntegrationTitle { get; set; }
 
-    /// <summary>
-    /// Either set by the end-user as instructions to self,
-    /// or provided by the SystemType as extra info
-    /// </summary>
-    public string? Description { get; set; }
-
     /// <summary>
     /// The actual chosen systemType that this SystemUser
     /// creates an integration / delegation for

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Integration/SystemUsers/SystemUserClient.cs

@@ -20,7 +20,6 @@ private static SystemUserReal MapDescriptorToSystemUserReal(SystemUserDescriptor
             ClientId = Guid.NewGuid().ToString(), 
             SystemType = sysdescr.SelectedSystemType,
             Title = sysdescr.IntegrationTitle,
-            Description = sysdescr.Description,
             Created = DateTime.UtcNow.Date.ToString()
 
         };       
@@ -66,8 +65,6 @@ public SystemUserClient(HttpClient httpClient)
         }
 
         return null;
-
-
     }
 
     public async Task<bool> DeleteSystemUserReal(Guid id, CancellationToken cancellationToken = default)

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemUsers/SystemUserClientMock.cs

@@ -62,7 +62,6 @@ private static SystemUserReal MapDescriptorToSystemUserReal(SystemUserDescriptor
             ClientId = Guid.NewGuid().ToString(), 
             SystemType = sysdescr.SelectedSystemType,
             Title = sysdescr.IntegrationTitle,
-            Description = sysdescr.Description,
             Created = DateTime.UtcNow.Date.ToString()
 
         };       

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Tests/Clients/SystemUserClientTest.cs

@@ -10,11 +10,11 @@ namespace Altinn.Authentication.UI.Tests.Clients;
 /// Needs a running instance of the Authentication Component on localhost on port 44377
 /// </summary>
 [Collection ("SystemUserClient Integration Test vs Authentication Component")]
-public class SystemUserClientTest : IClassFixture<CustomWebApplicationFactory<SystemUserController>>
+public class SystemUserClientIntegrationTest : IClassFixture<CustomWebApplicationFactory<SystemUserController>>
 {
     private readonly ISystemUserClient _systemUserClient;
 
-    public SystemUserClientTest()
+    public SystemUserClientIntegrationTest()
     {
         _systemUserClient = new SystemUserClient(
             new HttpClient{BaseAddress = new UriBuilder("https://localhost:44377/").Uri});

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs

@@ -24,8 +24,21 @@ public async Task<ActionResult> GetListOfRegisteredSystems(CancellationToken can
     {
         List<RegisteredSystemDTO> lista = new();
 
-        lista.AddRange( await _systemRegisterService.GetListRegSys(cancellationToken));
+        lista.AddRange(await _systemRegisterService.GetListRegSys(cancellationToken));
 
         return Ok(lista);
     }
+
+    [HttpGet("product/{productId}")]
+    public async Task<ActionResult> GetDefaultRightsForProductName(string productId, CancellationToken cancellationToken = default)    
+    {
+        List<DefaultRightsDTO> lista = new();
+        DefaultRightsDTO l1 = new() { Right = "Mva Registrering", ServiceProvider = "Skatteetaten" };
+        DefaultRightsDTO l2 = new() { Right = "Lønns Rapportering", ServiceProvider = "Skatteetaten" };
+        DefaultRightsDTO l3 = new() { Right = "Lakselus Rapportering", ServiceProvider = "Mattilsynet" };
+        lista.Add(l1);
+        lista.Add(l2);
+        lista.Add(l3);
+        return Ok(lista);
+    }
 }

bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemUserController.cs

@@ -1,4 +1,5 @@
-using Altinn.Authentication.UI.Core.SystemUsers;
+using Altinn.Authentication.UI.Core.Authentication;
+using Altinn.Authentication.UI.Core.SystemUsers;
 using Altinn.Authentication.UI.Filters;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -17,13 +18,15 @@ namespace Altinn.Authentication.UI.Controllers;
 public class SystemUserController : ControllerBase
 {
     ISystemUserService _systemUserService;
+    IHttpContextAccessor _httpContextAccessor;
 
     /// <summary>
     /// Constructor for <see cref="SystemUserController"/>
     /// </summary>
-    public SystemUserController(ISystemUserService systemUserService)
+    public SystemUserController(ISystemUserService systemUserService, IHttpContextAccessor httpContextAccessor)
     {
-        _systemUserService = systemUserService; 
+        _systemUserService = systemUserService;
+        _httpContextAccessor = httpContextAccessor;
     }
 
 
@@ -88,9 +91,11 @@ public async Task<ActionResult> UploadCertificate([FromForm] IFormFile file, [Fr
 
     //[Authorize]
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    [HttpPost("{partyId}")]
-    public async Task<ActionResult> Post(int partyId ,[FromBody] SystemUserDescriptor newSystemUserDescriptor, CancellationToken cancellationToken = default)
+    [HttpPost]
+    public async Task<ActionResult> Post([FromBody] SystemUserDescriptor newSystemUserDescriptor, CancellationToken cancellationToken = default)
     {
+        int partyId = AuthenticationHelper.GetUsersPartyId( _httpContextAccessor.HttpContext!);
+
         var usr = await _systemUserService.PostNewSystemUserDescriptor(partyId, newSystemUserDescriptor, cancellationToken);
         if (usr is not null)
         {
@@ -105,8 +110,7 @@ public async Task<ActionResult> Post(int partyId ,[FromBody] SystemUserDescripto
     [HttpPut("{id}")]
     public async void Put(Guid id, [FromBody] SystemUserDescriptor modifiedSystemUser, CancellationToken cancellationToken = default)
     {
-        if (modifiedSystemUser.IntegrationTitle is not null) await _systemUserService.ChangeSystemUserTitle(modifiedSystemUser.IntegrationTitle, id, cancellationToken);
-        if (modifiedSystemUser.Description is not null) await _systemUserService.ChangeSystemUserTitle(modifiedSystemUser.Description, id, cancellationToken);
+        if (modifiedSystemUser.IntegrationTitle is not null) await _systemUserService.ChangeSystemUserTitle(modifiedSystemUser.IntegrationTitle, id, cancellationToken);      
         if (modifiedSystemUser.SelectedSystemType is not null) await _systemUserService.ChangeSystemUserProduct(modifiedSystemUser.SelectedSystemType, id, cancellationToken);
     }