Merge branch 'main' into feat/signature-validation

Author: bjorntore

Directory.Packages.props

@@ -35,8 +35,8 @@
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
     <PackageVersion Include="Microsoft.FeatureManagement.AspNetCore" Version="4.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="Microsoft.OpenApi" Version="1.6.27" />
-    <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.27" />
+    <PackageVersion Include="Microsoft.OpenApi" Version="1.6.28" />
+    <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.28" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta14" />

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.414",
+        "version": "8.0.415",
         "rollForward": "latestFeature",
         "allowPrerelease": false
     }

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

@@ -37,17 +37,22 @@ public ActionResult GetModelJsonSchema([FromRoute] string id)
 
     /// <summary>
     /// Get the form layout
+    /// </summary>
     /// <param name="org">Unique identifier of the organisation responsible for the app.</param>
     /// <param name="app">Application identifier which is unique within an organisation.</param>
+    /// <remarks> This endpoint assumes a single layout set and does not work for apps on version 8.0 and above.</remarks>
     /// <returns>A collection of FormLayout objects in JSON format.</returns>
-    /// </summary>
-    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "application/json")]
+    [ProducesResponseType(typeof(string), StatusCodes.Status404NotFound, "text/plain")]
     [HttpGet]
     [Route("{org}/{app}/api/layouts")]
+    [Obsolete(
+        "This endpoint is no longer available. Use /{org}/{app}/api/layoutsets to get available layout sets and /{org}/{app}/api/layouts/{id} to get layouts for a specific layout set."
+    )]
     public ActionResult GetLayouts(string org, string app)
     {
-        string layouts = _appResourceService.GetLayouts();
-        return Ok(layouts);
+        return NotFound(
+            "This endpoint is no longer available. Use /{org}/{app}/api/layoutsets to get available layout sets and /{org}/{app}/api/layouts/{id} to get layouts for a specific layout set."
+        );
     }
 
     /// <summary>

src/Altinn.App.Core/Implementation/AppResourcesSI.cs

@@ -218,6 +218,7 @@ public string GetClassRefForLogicDataType(string dataType)
     }
 
     /// <inheritdoc />
+    [Obsolete("Use GetLayoutsForSet or GetLayoutModelForTask instead")]
     public string GetLayouts()
     {
         using var activity = _telemetry?.StartGetLayoutsActivity();

src/Altinn.App.Core/Internal/App/IAppResources.cs

@@ -82,6 +82,7 @@ public interface IAppResources
     /// Gets the layouts for the app.
     /// </summary>
     /// <returns>A dictionary of FormLayout objects serialized to JSON</returns>
+    [Obsolete("Use GetLayoutsForSet or GetLayoutModelForTask instead")]
     string GetLayouts();
 
     /// <summary>

test/Altinn.App.Api.Tests/OpenApi/OpenApiSpecChangeDetection.SaveJsonSwagger.verified.json

@@ -5090,11 +5090,13 @@
         "tags": [
           "Resource"
         ],
-        "summary": "Get the form layout\n<param name=\"org\">Unique identifier of the organisation responsible for the app.</param><param name=\"app\">Application identifier which is unique within an organisation.</param><returns>A collection of FormLayout objects in JSON format.</returns>",
+        "summary": "Get the form layout",
+        "description": "This endpoint assumes a single layout set and does not work for apps on version 8.0 and above.",
         "parameters": [
           {
             "name": "org",
             "in": "path",
+            "description": "Unique identifier of the organisation responsible for the app.",
             "required": true,
             "schema": {
               "type": "string"
@@ -5103,24 +5105,26 @@
           {
             "name": "app",
             "in": "path",
+            "description": "Application identifier which is unique within an organisation.",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
         "responses": {
-          "200": {
-            "description": "OK",
+          "404": {
+            "description": "Not Found",
             "content": {
-              "application/json": {
+              "text/plain": {
                 "schema": {
                   "type": "string"
                 }
               }
             }
           }
-        }
+        },
+        "deprecated": true
       }
     },
     "/{org}/{app}/api/layouts/{id}": {

test/Altinn.App.Api.Tests/PublicApiTests.PublicApi_ShouldNotChange_Unintentionally.verified.txt

@@ -535,8 +535,11 @@ namespace Altinn.App.Api.Controllers
         [Microsoft.AspNetCore.Mvc.Route("{org}/{app}/api/layoutsettings/{id}")]
         public Microsoft.AspNetCore.Mvc.ActionResult GetLayoutSettings(string org, string app, string id) { }
         [Microsoft.AspNetCore.Mvc.HttpGet]
-        [Microsoft.AspNetCore.Mvc.ProducesResponseType(typeof(string), 200, "application/json", new string[0])]
+        [Microsoft.AspNetCore.Mvc.ProducesResponseType(typeof(string), 404, "text/plain", new string[0])]
         [Microsoft.AspNetCore.Mvc.Route("{org}/{app}/api/layouts")]
+        [System.Obsolete("This endpoint is no longer available. Use /{org}/{app}/api/layoutsets to get avai" +
+            "lable layout sets and /{org}/{app}/api/layouts/{id} to get layouts for a specifi" +
+            "c layout set.")]
         public Microsoft.AspNetCore.Mvc.ActionResult GetLayouts(string org, string app) { }
         [Microsoft.AspNetCore.Mvc.HttpGet]
         [Microsoft.AspNetCore.Mvc.ProducesResponseType(typeof(string), 200, "application/json", new string[0])]

test/Altinn.App.Core.Tests/PublicApiTests.PublicApi_ShouldNotChange_Unintentionally.verified.txt

@@ -2280,6 +2280,7 @@ namespace Altinn.App.Core.Implementation
         public Altinn.App.Core.Models.LayoutSettings? GetLayoutSettingsForSet(string? layoutSetId) { }
         public string? GetLayoutSettingsString() { }
         public string? GetLayoutSettingsStringForSet(string layoutSetId) { }
+        [System.Obsolete("Use GetLayoutsForSet or GetLayoutModelForTask instead")]
         public string GetLayouts() { }
         public string GetLayoutsForSet(string layoutSetId) { }
         public string GetModelJsonSchema(string modelId) { }
@@ -2847,6 +2848,7 @@ namespace Altinn.App.Core.Internal.App
         Altinn.App.Core.Models.LayoutSettings? GetLayoutSettingsForSet(string? layoutSetId);
         string? GetLayoutSettingsString();
         string? GetLayoutSettingsStringForSet(string layoutSetId);
+        [System.Obsolete("Use GetLayoutsForSet or GetLayoutModelForTask instead")]
         string GetLayouts();
         string GetLayoutsForSet(string layoutSetId);
         string GetModelJsonSchema(string modelId);