Update Altinn.Common.PEP and use await Verify() instead of custom code (

#918) * Use await Verify() instead of custom code * Update Altinn.Common.PEP and Storage.Interfaces
Altinn · Nov 21, 2024 · 390d3e5 · 390d3e5
1 parent 26182f1
commit 390d3e5
Show file tree

Hide file tree

Showing 13 changed files with 358 additions and 433 deletions.
diff --git a/src/Altinn.App.Api/Altinn.App.Api.csproj b/src/Altinn.App.Api/Altinn.App.Api.csproj
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Altinn.Common.PEP" Version="4.0.0" />
-    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.0" />
+    <PackageReference Include="Altinn.Common.PEP" Version="4.1.0" />
+    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.3" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />

diff --git a/src/Altinn.App.Core/Altinn.App.Core.csproj b/src/Altinn.App.Core/Altinn.App.Core.csproj
@@ -13,9 +13,9 @@
     <PackageReference Include="Altinn.ApiClients.Maskinporten" Version="8.0.1" />
     <PackageReference Include="Altinn.Common.AccessTokenClient" Version="1.1.5" />
     <PackageReference Include="Altinn.Common.EFormidlingClient" Version="1.3.3" />
-    <PackageReference Include="Altinn.Common.PEP" Version="4.0.0" />
+    <PackageReference Include="Altinn.Common.PEP" Version="4.1.0" />
     <PackageReference Include="Altinn.Platform.Models" Version="1.6.1" />
-    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.0" />
+    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.3" />
     <PackageReference Include="JsonPatch.Net" Version="3.1.1" />
     <PackageReference Include="JWTCookieAuthentication" Version="3.0.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />

diff --git a/test/Altinn.App.Api.Tests/OpenApi/swagger.json b/test/Altinn.App.Api.Tests/OpenApi/swagger.json
@@ -5464,7 +5464,7 @@
           "copyInstanceSettings": {
             "$ref": "#/components/schemas/CopyInstanceSettings"
           },
-          "storageContainerNumber": {
+          "storageAccountNumber": {
             "type": "integer",
             "format": "int32",
             "nullable": true

diff --git a/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml b/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml
@@ -3361,7 +3361,7 @@ components:
           $ref: '#/components/schemas/MessageBoxConfig'
         copyInstanceSettings:
           $ref: '#/components/schemas/CopyInstanceSettings'
-        storageContainerNumber:
+        storageAccountNumber:
           type: integer
           format: int32
           nullable: true

diff --git a/...equest_generates_multidecisionrequest_with_all_actions_current_task_elemtnId.verified.txt b/...equest_generates_multidecisionrequest_with_all_actions_current_task_elemtnId.verified.txt
@@ -0,0 +1,113 @@
+{
+  Request: {
+    ReturnPolicyIdList: false,
+    CombinedDecision: false,
+    Resource: [
+      {
+        Id: r1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:task,
+            Value: Task_1,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:instance-id,
+            Value: 1337/1dd16477-187b-463c-8adf-592c7fa78459,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:org,
+            Value: tdd,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:app,
+            Value: test-app,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    Action: [
+      {
+        Id: a1,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: sign,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      },
+      {
+        Id: a2,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: reject,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      }
+    ],
+    AccessSubject: [
+      {
+        Id: s1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:authlevel,
+            Value: 3,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    MultiRequests: {
+      RequestReference: [
+        {
+          ReferenceId: [
+            s1,
+            a1,
+            r1
+          ]
+        },
+        {
+          ReferenceId: [
+            s1,
+            a2,
+            r1
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/...ultiDecisionRequest_generates_multidecisionrequest_with_all_actions_endevent.verified.txt b/...ultiDecisionRequest_generates_multidecisionrequest_with_all_actions_endevent.verified.txt
@@ -0,0 +1,113 @@
+{
+  Request: {
+    ReturnPolicyIdList: false,
+    CombinedDecision: false,
+    Resource: [
+      {
+        Id: r1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:end-event,
+            Value: EndEvent_1,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:instance-id,
+            Value: 1337/1dd16477-187b-463c-8adf-592c7fa78459,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:org,
+            Value: tdd,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:app,
+            Value: test-app,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    Action: [
+      {
+        Id: a1,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: sign,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      },
+      {
+        Id: a2,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: reject,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      }
+    ],
+    AccessSubject: [
+      {
+        Id: s1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:authlevel,
+            Value: 3,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    MultiRequests: {
+      RequestReference: [
+        {
+          ReferenceId: [
+            s1,
+            a1,
+            r1
+          ]
+        },
+        {
+          ReferenceId: [
+            s1,
+            a2,
+            r1
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/...uest_generates_multidecisionrequest_with_all_actions_instanceId_is_GUID_only.verified.txt b/...uest_generates_multidecisionrequest_with_all_actions_instanceId_is_GUID_only.verified.txt
@@ -0,0 +1,113 @@
+{
+  Request: {
+    ReturnPolicyIdList: false,
+    CombinedDecision: false,
+    Resource: [
+      {
+        Id: r1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:task,
+            Value: Task_1,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:instance-id,
+            Value: 1337/1dd16477-187b-463c-8adf-592c7fa78459,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:org,
+            Value: tdd,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:app,
+            Value: test-app,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    Action: [
+      {
+        Id: a1,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: sign,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      },
+      {
+        Id: a2,
+        Attribute: [
+          {
+            AttributeId: urn:oasis:names:tc:xacml:1.0:action:action-id,
+            Value: reject,
+            Issuer: Altinn,
+            DataType: string,
+            IncludeInResult: true
+          }
+        ]
+      }
+    ],
+    AccessSubject: [
+      {
+        Id: s1,
+        Attribute: [
+          {
+            AttributeId: urn:altinn:authlevel,
+            Value: 3,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          },
+          {
+            AttributeId: urn:altinn:partyid,
+            Value: 1337,
+            Issuer: LOCAL AUTHORITY,
+            DataType: string,
+            IncludeInResult: false
+          }
+        ]
+      }
+    ],
+    MultiRequests: {
+      RequestReference: [
+        {
+          ReferenceId: [
+            s1,
+            a1,
+            r1
+          ]
+        },
+        {
+          ReferenceId: [
+            s1,
+            a2,
+            r1
+          ]
+        }
+      ]
+    }
+  }
+}