Stream Correspondence attachments to support large file upload

src/Altinn.App.Core/Features/Correspondence/Builder/CorrespondenceAttachmentBuilder.cs

@@ -9,7 +9,7 @@ public class CorrespondenceAttachmentBuilder : ICorrespondenceAttachmentBuilder
 {
     private string? _filename;
     private string? _sendersReference;
-    private ReadOnlyMemory<byte>? _data;
+    private Stream? _data;
     private bool? _isEncrypted;
     private CorrespondenceDataLocationType _dataLocationType =
         CorrespondenceDataLocationType.ExistingCorrespondenceAttachment;
@@ -41,6 +41,14 @@ public ICorrespondenceAttachmentBuilderData WithSendersReference(string sendersR
     public ICorrespondenceAttachmentBuilder WithData(ReadOnlyMemory<byte> data)
     {
         BuilderUtils.NotNullOrEmpty(data, "Data cannot be empty");
+        var memStream = new MemoryStream(data.ToArray());
+        _data = memStream;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    public ICorrespondenceAttachmentBuilder WithData(Stream data)
+    {
         _data = data;
         return this;
     }
@@ -70,7 +78,7 @@ public CorrespondenceAttachment Build()
         {
             Filename = _filename,
             SendersReference = _sendersReference,
-            Data = _data.Value,
+            Data = _data,
             IsEncrypted = _isEncrypted,
             DataLocationType = _dataLocationType,
         };

src/Altinn.App.Core/Features/Correspondence/CorrespondenceClient.cs

@@ -191,6 +191,11 @@ CancellationToken cancellationToken
     )
     {
         using HttpClient client = _httpClientFactory.CreateClient();
+
+        // Configure HttpClient for large file uploads
+        client.Timeout = TimeSpan.FromMinutes(30);
+        client.DefaultRequestHeaders.ExpectContinue = false;
+
         using HttpResponseMessage response = await client.SendAsync(request, cancellationToken);
         string responseBody = await response.Content.ReadAsStringAsync(cancellationToken);
 

src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceAttachment.cs

@@ -29,7 +29,7 @@ public sealed record CorrespondenceAttachment : MultipartCorrespondenceItem
     /// <summary>
     /// The data content.
     /// </summary>
-    public required ReadOnlyMemory<byte> Data { get; init; }
+    public required Stream Data { get; init; }
 
     internal void Serialise(MultipartFormDataContent content, int index, string? filenameOverride = null)
     {
@@ -40,7 +40,7 @@ internal void Serialise(MultipartFormDataContent content, int index, string? fil
         AddRequired(content, actualFilename, $"{prefix}.Filename");
         AddRequired(content, SendersReference, $"{prefix}.SendersReference");
         AddRequired(content, DataLocationType.ToString(), $"{prefix}.DataLocationType");
-        AddRequired(content, Data, "Attachments", actualFilename); // NOTE: No prefix!
+        AddRequired(content, Data, "Attachments", actualFilename);
         AddIfNotNull(content, IsEncrypted?.ToString(), $"{prefix}.IsEncrypted");
     }
 }

src/Altinn.App.Core/Features/Correspondence/Models/CorrespondenceRequest.cs

@@ -41,6 +41,13 @@ string filename
         content.Add(new ReadOnlyMemoryContent(data), name, filename);
     }
 
+    internal static void AddRequired(MultipartFormDataContent content, Stream data, string name, string filename)
+    {
+        if (data is null)
+            throw new CorrespondenceArgumentException($"Required value is missing: {name}");
+        content.Add(new StreamContent(data), name, filename);
+    }
+
     internal static void AddIfNotNull(MultipartFormDataContent content, string? value, string name)
     {
         if (!string.IsNullOrWhiteSpace(value))

test/Altinn.App.Core.Tests/Features/Correspondence/Builder/CorrespondenceBuilderTests.cs

@@ -199,7 +199,7 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
                 {
                     Filename = data.attachments[1].filename,
                     SendersReference = data.attachments[1].sendersReference,
-                    Data = Encoding.UTF8.GetBytes(data.attachments[1].data),
+                    Data = new MemoryStream(Encoding.UTF8.GetBytes(data.attachments[1].data)),
                     DataLocationType = data.attachments[1].dataLocationType,
                     IsEncrypted = data.attachments[1].isEncrypted,
                 }
@@ -210,7 +210,7 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
                     {
                         Filename = data.attachments[2].filename,
                         SendersReference = data.attachments[2].sendersReference,
-                        Data = Encoding.UTF8.GetBytes(data.attachments[2].data),
+                        Data = new MemoryStream(Encoding.UTF8.GetBytes(data.attachments[2].data)),
                         DataLocationType = data.attachments[2].dataLocationType,
                         IsEncrypted = data.attachments[2].isEncrypted,
                     },
@@ -273,10 +273,9 @@ public void Build_WithAllProperties_ShouldReturnValidCorrespondence()
             correspondence.Content.Attachments[i].IsEncrypted.Should().Be(data.attachments[i].isEncrypted);
             correspondence.Content.Attachments[i].SendersReference.Should().Be(data.attachments[i].sendersReference);
             correspondence.Content.Attachments[i].DataLocationType.Should().Be(data.attachments[i].dataLocationType);
-            Encoding
-                .UTF8.GetString(correspondence.Content.Attachments[i].Data.Span)
-                .Should()
-                .Be(data.attachments[i].data);
+            var byteArray = new byte[correspondence.Content.Attachments[i].Data.Length];
+            correspondence.Content.Attachments[i].Data.ReadExactly(byteArray);
+            Encoding.UTF8.GetString(byteArray).Should().Be(data.attachments[i].data);
         }
 
         correspondence.Notification.NotificationTemplate.Should().Be(data.notification.template);

test/Altinn.App.Core.Tests/Features/Correspondence/Models/CorrespondenceRequestTests.cs

@@ -42,13 +42,13 @@ public async Task Serialise_ShouldAddCorrectFields()
                     {
                         Filename = "filename-1",
                         SendersReference = "senders-reference-1",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                     },
                     new CorrespondenceAttachment
                     {
                         Filename = "filename-2",
                         SendersReference = "senders-reference-2",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                         DataLocationType = CorrespondenceDataLocationType.NewCorrespondenceAttachment,
                         IsEncrypted = true,
                     },
@@ -212,13 +212,13 @@ public async Task Serialise_ShouldAddCorrectFields_IsReservedOverridesIgnoreRese
                     {
                         Filename = "filename-1",
                         SendersReference = "senders-reference-1",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                     },
                     new CorrespondenceAttachment
                     {
                         Filename = "filename-2",
                         SendersReference = "senders-reference-2",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                         DataLocationType = CorrespondenceDataLocationType.NewCorrespondenceAttachment,
                         IsEncrypted = true,
                     },
@@ -376,13 +376,13 @@ public async Task Serialise_ShouldHandleClashingFilenames(string clashingFilenam
                     {
                         Filename = clashingFilename,
                         SendersReference = "senders-reference-1",
-                        Data = Encoding.UTF8.GetBytes("data-1"),
+                        Data = new MemoryStream(Encoding.UTF8.GetBytes("data-1")),
                     },
                     new CorrespondenceAttachment
                     {
                         Filename = clashingFilename,
                         SendersReference = "senders-reference-2",
-                        Data = Encoding.UTF8.GetBytes("data-2"),
+                        Data = new MemoryStream(Encoding.UTF8.GetBytes("data-2")),
                     },
                 ],
             },
@@ -407,19 +407,19 @@ public void Serialise_ClashingFilenames_ShouldUseReferenceComparison()
             {
                 Filename = "filename",
                 SendersReference = "senders-reference",
-                Data = data,
+                Data = new MemoryStream(data.ToArray()),
             },
             new CorrespondenceAttachment
             {
                 Filename = "filename",
                 SendersReference = "senders-reference",
-                Data = data,
+                Data = new MemoryStream(data.ToArray()),
             },
             new CorrespondenceAttachment
             {
                 Filename = "filename",
                 SendersReference = "senders-reference",
-                Data = data,
+                Data = new MemoryStream(data.ToArray()),
             },
         ];
         var clonedAttachment = identicalAttachments[^1];

test/Altinn.App.Core.Tests/Features/Correspondence/Models/CorrespondenceRequestTests_Obsolete.cs

@@ -43,13 +43,13 @@ public async Task Serialise_ShouldAddCorrectFields()
                     {
                         Filename = "filename-1",
                         SendersReference = "senders-reference-1",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                     },
                     new CorrespondenceAttachment
                     {
                         Filename = "filename-2",
                         SendersReference = "senders-reference-2",
-                        Data = "data"u8.ToArray(),
+                        Data = new MemoryStream("data"u8.ToArray()),
                         DataLocationType = CorrespondenceDataLocationType.NewCorrespondenceAttachment,
                         IsEncrypted = true,
                     },

test/Altinn.App.Core.Tests/Features/Signing/SigningReceiptServiceTests.cs

@@ -434,7 +434,9 @@ public async Task GetCorrespondenceAttachments_ReturnsCorrectAttachments()
         CorrespondenceAttachment attachment = attachments.First();
         Assert.Equal("signed.pdf", attachment.Filename);
         Assert.Equal(signedElement.Id, attachment.SendersReference);
-        Assert.Equal(new byte[] { 1, 2, 3 }, attachment.Data);
+        var byteArray = new byte[3];
+        attachment.Data.ReadExactly(byteArray);
+        Assert.Equal(new byte[] { 1, 2, 3 }, byteArray);
     }
 
     [Fact]

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

@@ -428,6 +428,7 @@ namespace Altinn.App.Core.Features.Correspondence.Builder
     public class CorrespondenceAttachmentBuilder : Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilder, Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilderData, Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilderFilename, Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilderSendersReference
     {
         public Altinn.App.Core.Features.Correspondence.Models.CorrespondenceAttachment Build() { }
+        public Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilder WithData(System.IO.Stream data) { }
         public Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilder WithData(System.ReadOnlyMemory<byte> data) { }
         public Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilder WithDataLocationType(Altinn.App.Core.Features.Correspondence.Models.CorrespondenceDataLocationType dataLocationType) { }
         public Altinn.App.Core.Features.Correspondence.Builder.ICorrespondenceAttachmentBuilderSendersReference WithFilename(string filename) { }
@@ -724,7 +725,7 @@ namespace Altinn.App.Core.Features.Correspondence.Models
     public sealed class CorrespondenceAttachment : Altinn.App.Core.Features.Correspondence.Models.MultipartCorrespondenceItem, System.IEquatable<Altinn.App.Core.Features.Correspondence.Models.CorrespondenceAttachment>
     {
         public CorrespondenceAttachment() { }
-        public required System.ReadOnlyMemory<byte> Data { get; init; }
+        public required System.IO.Stream Data { get; init; }
         public Altinn.App.Core.Features.Correspondence.Models.CorrespondenceDataLocationType DataLocationType { get; init; }
         public required string Filename { get; init; }
         public bool? IsEncrypted { get; init; }