Update correspondence scope (#943)

Altinn · Dec 2, 2024 · cf3da98 · cf3da98
1 parent ad4193e
commit cf3da98
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 41 deletions.
diff --git a/src/Altinn.App.Core/Features/Correspondence/Builder/BuilderUtils.cs b/src/Altinn.App.Core/Features/Correspondence/Builder/BuilderUtils.cs
@@ -13,7 +13,7 @@ internal static class BuilderUtils
     /// </summary>
     /// <param name="value">The value to assert</param>
     /// <param name="errorMessage">The error message to throw, if the value was null</param>
-    /// <exception cref="CorrespondenceValueException"></exception>
+    /// <exception cref="CorrespondenceArgumentException"></exception>
     internal static void NotNullOrEmpty([NotNull] object? value, string? errorMessage = null)
     {
         if (
@@ -23,7 +23,7 @@ value is null
             || value is DateTimeOffset dt && dt == DateTimeOffset.MinValue
         )
         {
-            throw new CorrespondenceValueException(errorMessage);
+            throw new CorrespondenceArgumentException(errorMessage);
         }
     }
 }
diff --git a/src/Altinn.App.Core/Features/Correspondence/CorrespondenceAuthorisationFactory.cs b/src/Altinn.App.Core/Features/Correspondence/CorrespondenceAuthorisationFactory.cs
@@ -15,7 +15,7 @@ internal sealed class CorrespondenceAuthorisationFactory
             _maskinportenClient ??= _serviceProvider.GetRequiredService<IMaskinportenClient>();
 
             return await _maskinportenClient.GetAltinnExchangedToken(
-                ["altinn:correspondence.write", "altinn:serviceowner/instances.read"]
+                ["altinn:correspondence.write", "altinn:serviceowner"]
             );
         };
 

diff --git a/src/Altinn.App.Core/Features/Correspondence/Exceptions/CorrespondenceValueException.cs b/src/Altinn.App.Core/Features/Correspondence/Exceptions/CorrespondenceValueException.cs
diff --git a/src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceAttachmentResponse.cs b/src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceAttachmentResponse.cs
@@ -61,15 +61,6 @@ public sealed record CorrespondenceAttachmentResponse
     [JsonPropertyName("name")]
     public required string Name { get; init; }
 
-    /// <summary>
-    /// The name of the restriction policy restricting access to this element
-    /// </summary>
-    /// <remarks>
-    /// An empty value indicates no restriction above the ones governing the correspondence referencing this attachment
-    /// </remarks>
-    [JsonPropertyName("restrictionName")]
-    public string? RestrictionName { get; init; }
-
     /// <summary>
     /// Indicates if the attachment is encrypted or not
     /// </summary>

diff --git a/src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceRequest.cs b/src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceRequest.cs
@@ -13,15 +13,15 @@ public abstract record MultipartCorrespondenceItem
     internal static void AddRequired(MultipartFormDataContent content, string value, string name)
     {
         if (string.IsNullOrWhiteSpace(value))
-            throw new CorrespondenceValueException($"Required value is missing: {name}");
+            throw new CorrespondenceArgumentException($"Required value is missing: {name}");
 
         content.Add(new StringContent(value), name);
     }
 
     internal static void AddRequired(MultipartFormDataContent content, DateTimeOffset value, string name)
     {
         if (value == default)
-            throw new CorrespondenceValueException($"Required value is missing: {name}");
+            throw new CorrespondenceArgumentException($"Required value is missing: {name}");
 
         var normalisedAndFormatted = NormaliseDateTime(value).ToString("O");
         content.Add(new StringContent(normalisedAndFormatted), name);
@@ -35,7 +35,7 @@ string filename
     )
     {
         if (data.IsEmpty)
-            throw new CorrespondenceValueException($"Required value is missing: {name}");
+            throw new CorrespondenceArgumentException($"Required value is missing: {name}");
 
         content.Add(new ReadOnlyMemoryContent(data), name, filename);
     }
@@ -165,7 +165,7 @@ internal void ValidateAllProperties(string dataTypeName)
 
         if (isValid is false)
         {
-            throw new CorrespondenceValueException(
+            throw new CorrespondenceArgumentException(
                 $"Validation failed for {dataTypeName}",
                 new AggregateException(validationResults.Select(x => new ValidationException(x.ErrorMessage)))
             );
@@ -355,7 +355,7 @@ private static string GetFormattedRecipient(OrganisationOrPersonIdentifier recip
         {
             OrganisationOrPersonIdentifier.Organisation org => org.Value.Get(OrganisationNumberFormat.International),
             OrganisationOrPersonIdentifier.Person person => person.Value.Value,
-            _ => throw new CorrespondenceValueException(
+            _ => throw new CorrespondenceArgumentException(
                 $"Unknown {nameof(OrganisationOrPersonIdentifier)} type `{recipient.GetType()}`"
             ),
         };

diff --git a/test/Altinn.App.Core.Tests/Features/Correspondence/Builder/CorrespondenceBuilderTests.cs b/test/Altinn.App.Core.Tests/Features/Correspondence/Builder/CorrespondenceBuilderTests.cs
@@ -104,7 +104,6 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
                     data = "attachment-data-1",
                     dataLocationType = CorrespondenceDataLocationType.ExistingCorrespondenceAttachment,
                     isEncrypted = false,
-                    restrictionName = "restriction-name-1",
                 },
                 new
                 {
@@ -116,7 +115,6 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
                     data = "attachment-data-2",
                     dataLocationType = CorrespondenceDataLocationType.NewCorrespondenceAttachment,
                     isEncrypted = true,
-                    restrictionName = "restriction-name-2",
                 },
                 new
                 {
@@ -128,7 +126,6 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
                     data = "attachment-data-3",
                     dataLocationType = CorrespondenceDataLocationType.ExisitingExternalStorage,
                     isEncrypted = false,
-                    restrictionName = "restriction-name-3",
                 },
             },
             existingAttachments = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() },

diff --git a/test/Altinn.App.Core.Tests/Features/Correspondence/CorrespondenceClientTests.cs b/test/Altinn.App.Core.Tests/Features/Correspondence/CorrespondenceClientTests.cs
@@ -378,8 +378,6 @@ var path when path.EndsWith("/correspondence/upload") => TestHelpers.ResponseMes
         // Assert
         response.Should().BeEquivalentTo(correspondenceResponse);
         mockMaskinportenClient.Verify();
-        capturedMaskinportenScopes
-            .Should()
-            .BeEquivalentTo(["altinn:correspondence.write", "altinn:serviceowner/instances.read"]);
+        capturedMaskinportenScopes.Should().BeEquivalentTo(["altinn:correspondence.write", "altinn:serviceowner"]);
     }
 }