Update parties controller

src/Altinn.App.Api/Controllers/AuthenticationController.cs

@@ -1,12 +1,9 @@
 using System.Text.Json.Serialization;
 using Altinn.App.Core.Configuration;
 using Altinn.App.Core.Constants;
-using Altinn.App.Core.Helpers;
-using Altinn.App.Core.Internal.App;
 using Altinn.App.Core.Internal.Auth;
 using Altinn.Platform.Profile.Models;
 using Altinn.Platform.Register.Models;
-using Altinn.Platform.Storage.Interface.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -20,7 +17,6 @@ public class AuthenticationController : ControllerBase
 {
     private readonly IAuthenticationClient _authenticationClient;
     private readonly GeneralSettings _settings;
-    private readonly IAppMetadata _appMetadata;
     private readonly IAuthenticationContext _authenticationContext;
 
     /// <summary>
@@ -29,13 +25,11 @@ public class AuthenticationController : ControllerBase
     public AuthenticationController(
         IAuthenticationClient authenticationClient,
         IOptions<GeneralSettings> settings,
-        IAppMetadata appMetadata,
         IServiceProvider serviceProvider
     )
     {
         _authenticationClient = authenticationClient;
         _settings = settings.Value;
-        _appMetadata = appMetadata;
         _authenticationContext = serviceProvider.GetRequiredService<IAuthenticationContext>();
     }
 
@@ -50,8 +44,6 @@ public async Task<ActionResult> GetCurrent()
     {
         var current = _authenticationContext.Current;
 
-        Application application = await _appMetadata.GetApplicationMetadata();
-
         CurrentAuthenticationBaseResponse response = current switch
         {
             AuthenticationInfo.Unauthenticated => new UnauthenticatedResponse(),
@@ -61,10 +53,7 @@ AuthenticationInfo.User user when await user.LoadDetails(validateSelectedParty:
                     Profile = details.Profile,
                     Party = details.Reportee,
                     Parties = details.Parties,
-                    PartiesAllowedToInstantiate = InstantiationHelper.FilterPartiesByAllowedPartyTypes(
-                        details.Parties,
-                        application.PartyTypesAllowed
-                    ),
+                    PartiesAllowedToInstantiate = details.PartiesAllowedToInstantiate,
                 },
             AuthenticationInfo.Org org when await org.LoadDetails() is var details => new OrgResponse
             {

src/Altinn.App.Api/Controllers/PartiesController.cs

@@ -28,6 +28,7 @@ public class PartiesController : ControllerBase
     private readonly IProfileClient _profileClient;
     private readonly GeneralSettings _settings;
     private readonly IAppMetadata _appMetadata;
+    private readonly IAuthenticationContext _authenticationContext;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="PartiesController"/> class
@@ -37,14 +38,16 @@ public PartiesController(
         IProfileClient profileClient,
         IAltinnPartyClient altinnPartyClientClient,
         IOptions<GeneralSettings> settings,
-        IAppMetadata appMetadata
+        IAppMetadata appMetadata,
+        IServiceProvider serviceProvider
     )
     {
         _authorizationClient = authorizationClient;
         _userHelper = new UserHelper(profileClient, altinnPartyClientClient, settings);
         _profileClient = profileClient;
         _settings = settings.Value;
         _appMetadata = appMetadata;
+        _authenticationContext = serviceProvider.GetRequiredService<IAuthenticationContext>();
     }
 
     /// <summary>
@@ -58,20 +61,37 @@ IAppMetadata appMetadata
     [HttpGet("{org}/{app}/api/v1/parties")]
     public async Task<IActionResult> Get(string org, string app, bool allowedToInstantiateFilter = false)
     {
-        UserContext userContext = await _userHelper.GetUserContext(HttpContext);
-        List<Party>? partyList = await _authorizationClient.GetPartyList(userContext.UserId);
-
-        if (allowedToInstantiateFilter)
+        var context = _authenticationContext.Current;
+        switch (context)
         {
-            Application application = await _appMetadata.GetApplicationMetadata();
-            List<Party> validParties = InstantiationHelper.FilterPartiesByAllowedPartyTypes(
-                partyList,
-                application.PartyTypesAllowed
-            );
-            return Ok(validParties);
+            case AuthenticationInfo.Unauthenticated:
+                return Unauthorized();
+            case AuthenticationInfo.User user:
+            {
+                var details = await user.LoadDetails(validateSelectedParty: false);
+                return allowedToInstantiateFilter ? Ok(details.PartiesAllowedToInstantiate) : Ok(details.Parties);
+            }
+            case AuthenticationInfo.Org orgInfo:
+            {
+                var details = await orgInfo.LoadDetails();
+                IReadOnlyList<Party> parties = [details.Party];
+                return Ok(parties);
+            }
+            case AuthenticationInfo.ServiceOwner serviceOwner:
+            {
+                var details = await serviceOwner.LoadDetails();
+                IReadOnlyList<Party> parties = [details.Party];
+                return Ok(parties);
+            }
+            case AuthenticationInfo.SystemUser su:
+            {
+                var details = await su.LoadDetails();
+                IReadOnlyList<Party> parties = [details.Party];
+                return Ok(parties);
+            }
+            default:
+                throw new NotImplementedException();
         }
-
-        return Ok(partyList);
     }
 
     /// <summary>

src/Altinn.App.Core/Internal/Auth/IAuthenticationContext.cs

@@ -2,6 +2,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Altinn.App.Core.Configuration;
+using Altinn.App.Core.Helpers;
+using Altinn.App.Core.Internal.App;
 using Altinn.App.Core.Internal.Profile;
 using Altinn.App.Core.Internal.Registers;
 using Altinn.App.Core.Models;
@@ -72,6 +74,7 @@ public sealed record User : AuthenticationInfo
         private readonly Func<int, Task<Party?>> _lookupParty;
         private readonly Func<int, Task<List<Party>?>> _getPartyList;
         private readonly Func<int, int, Task<bool?>> _validateSelectedParty;
+        private readonly Func<Task<ApplicationMetadata>> _getApplicationMetadata;
 
         internal User(
             int userId,
@@ -82,7 +85,8 @@ internal User(
             Func<int, Task<UserProfile?>> getUserProfile,
             Func<int, Task<Party?>> lookupParty,
             Func<int, Task<List<Party>?>> getPartyList,
-            Func<int, int, Task<bool?>> validateSelectedParty
+            Func<int, int, Task<bool?>> validateSelectedParty,
+            Func<Task<ApplicationMetadata>> getApplicationMetadata
         )
             : base(token)
         {
@@ -94,6 +98,7 @@ internal User(
             _lookupParty = lookupParty;
             _getPartyList = getPartyList;
             _validateSelectedParty = validateSelectedParty;
+            _getApplicationMetadata = getApplicationMetadata;
         }
 
         /// <summary>
@@ -103,12 +108,14 @@ internal User(
         /// <param name="Profile">Users profile</param>
         /// <param name="RepresentsSelf">True if the user represents itself</param>
         /// <param name="Parties">List of parties the user can represent</param>
+        /// <param name="PartiesAllowedToInstantiate">List of parties the user can instantiate</param>
         /// <param name="CanRepresent">True if the user can represent the selected party. Only set if details were loaded with validateSelectedParty set to true</param>
         public sealed record Details(
             Party Reportee,
             UserProfile Profile,
             bool RepresentsSelf,
             IReadOnlyList<Party> Parties,
+            IReadOnlyList<Party> PartiesAllowedToInstantiate,
             bool? CanRepresent = null
         );
 
@@ -149,7 +156,20 @@ await _getUserProfile(UserId)
                 canRepresent = await _validateSelectedParty(UserId, PartyId);
             }
 
-            _extra = new Details(reportee, userProfile, representsSelf, parties, canRepresent);
+            var application = await _getApplicationMetadata();
+            var partiesAllowedToInstantiate = InstantiationHelper.FilterPartiesByAllowedPartyTypes(
+                parties,
+                application.PartyTypesAllowed
+            );
+
+            _extra = new Details(
+                reportee,
+                userProfile,
+                representsSelf,
+                parties,
+                partiesAllowedToInstantiate,
+                canRepresent
+            );
             return _extra;
         }
     }
@@ -319,7 +339,8 @@ internal static AuthenticationInfo From(
         Func<int, Task<Party?>> lookupUserParty,
         Func<string, Task<Party>> lookupOrgParty,
         Func<int, Task<List<Party>?>> getPartyList,
-        Func<int, int, Task<bool?>> validateSelectedParty
+        Func<int, int, Task<bool?>> validateSelectedParty,
+        Func<Task<ApplicationMetadata>> getApplicationMetadata
     )
     {
         string token = JwtTokenUtil.GetTokenFromContext(httpContext, authCookieName);
@@ -452,7 +473,8 @@ static void ParseAuthLevel(string? value, out int authLevel)
             getUserProfile,
             lookupUserParty,
             getPartyList,
-            validateSelectedParty
+            validateSelectedParty,
+            getApplicationMetadata
         );
     }
 
@@ -491,14 +513,16 @@ internal sealed class AuthenticationContext : IAuthenticationContext
     private readonly IProfileClient _profileClient;
     private readonly IAltinnPartyClient _altinnPartyClient;
     private readonly IAuthorizationClient _authorizationClient;
+    private readonly IAppMetadata _appMetadata;
 
     public AuthenticationContext(
         IHttpContextAccessor httpContextAccessor,
         IOptionsMonitor<AppSettings> appSettings,
         IOptionsMonitor<GeneralSettings> generalSettings,
         IProfileClient profileClient,
         IAltinnPartyClient altinnPartyClient,
-        IAuthorizationClient authorizationClient
+        IAuthorizationClient authorizationClient,
+        IAppMetadata appMetadata
     )
     {
         _httpContextAccessor = httpContextAccessor;
@@ -507,6 +531,7 @@ IAuthorizationClient authorizationClient
         _profileClient = profileClient;
         _altinnPartyClient = altinnPartyClient;
         _authorizationClient = authorizationClient;
+        _appMetadata = appMetadata;
     }
 
     // Currently we're coupling this to the HTTP context directly.
@@ -529,7 +554,8 @@ internal void ResolveCurrent()
             _altinnPartyClient.GetParty,
             (string orgNr) => _altinnPartyClient.LookupParty(new PartyLookup { OrgNo = orgNr }),
             _authorizationClient.GetPartyList,
-            _authorizationClient.ValidateSelectedParty
+            _authorizationClient.ValidateSelectedParty,
+            _appMetadata.GetApplicationMetadata
         );
         httpContext.Items[ItemsKey] = authInfo;
     }