Extend mottatmelding basert på pullrequest fra ErHaWi

KS.Fiks.IO.Client/Asic/AsicDecrypter.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using KS.Fiks.ASiC_E;
 using KS.Fiks.Crypto;
 using KS.Fiks.IO.Client.Exceptions;
+using KS.Fiks.IO.Client.Models;
 
 namespace KS.Fiks.IO.Client.Asic
 {
@@ -43,5 +47,32 @@ public async Task<Stream> Decrypt(Task<Stream> encryptedZipStream)
                 throw new FiksIODecryptionException("Unable to decrypt melding. Is your private key correct?", ex);
             }
         }
+
+        public async Task<IEnumerable<IPayload>> DecryptAndExtractPayloads(Task<Stream> encryptedZipStream)
+        {
+            var payloads = new List<StreamPayload>();
+
+            using (var stream = await Decrypt(encryptedZipStream).ConfigureAwait(false))
+            {
+                var asiceReader = new AsiceReader().Read(stream);
+
+                foreach (var entry in asiceReader.Entries)
+                {
+                    using (var entryStream = entry.OpenStream())
+                    {
+
+                        var memoryStream = new MemoryStream();
+
+                        await entryStream.CopyToAsync(memoryStream).ConfigureAwait(false);
+
+                        var payload = new StreamPayload(memoryStream, entry.FileName);
+
+                        payloads.Add(payload);
+                    }
+                }
+            }
+
+            return payloads;
+        }
     }
 }

KS.Fiks.IO.Client/Asic/IAsicDecrypter.cs

@@ -1,5 +1,8 @@
+using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using KS.Fiks.IO.Client.Models;
 
 namespace KS.Fiks.IO.Client.Asic
 {
@@ -8,5 +11,7 @@ public interface IAsicDecrypter
         Task WriteDecrypted(Task<Stream> encryptedZipStream, string outPath);
 
         Task<Stream> Decrypt(Task<Stream> encryptedZipStream);
+
+        Task<IEnumerable<IPayload>> DecryptAndExtractPayloads(Task<Stream> encryptedZipStream);
     }
 }

KS.Fiks.IO.Client/Models/IMottattMelding.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -10,12 +11,14 @@ public interface IMottattMelding : IMelding
 
         Guid? SvarPaMelding { get; }
 
-        Task<Stream> EncryptedStream { get;  }
+        Task<Stream> EncryptedStream { get; }
 
-        Task<Stream> DecryptedStream { get;  }
+        Task<Stream> DecryptedStream { get; }
 
         Task WriteEncryptedZip(string outPath);
 
         Task WriteDecryptedZip(string outPath);
+
+        Task<IEnumerable<IPayload>> DecryptedPayloads { get; }
     }
 }

KS.Fiks.IO.Client/Models/MottattMelding.cs

@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using KS.Fiks.ASiC_E;
+using KS.Fiks.ASiC_E.Model;
 using KS.Fiks.IO.Client.Asic;
 using KS.Fiks.IO.Client.FileIO;
 
@@ -11,6 +14,7 @@ public class MottattMelding : MottattMeldingMetadata, IMottattMelding
         private readonly Func<Task<Stream>> _streamProvider;
         private readonly IAsicDecrypter _decrypter;
         private readonly IFileWriter _fileWriter;
+        private IEnumerable<IPayload> _payloads;
 
         internal MottattMelding(
             bool hasPayload,
@@ -41,5 +45,7 @@ public async Task WriteDecryptedZip(string outPath)
         {
             await _decrypter.WriteDecrypted(_streamProvider(), outPath).ConfigureAwait(false);
         }
+
+        public Task<IEnumerable<IPayload>> DecryptedPayloads => _decrypter.DecryptAndExtractPayloads(_streamProvider());
     }
 }