Availability and optional Sender for Statuschange

- Availability was never implemented -- now it is
- Statuschange uses ClientConfig sender by default, input otherwise

Author: Aleksander Aas Sjåfjell

Digipost.Signature.Api.Client.Core/Asice/AsiceSignature/SignatureGenerator.cs

@@ -71,7 +71,6 @@ private XmlDocument CreateXadesSignatureElement()
             signatureDocument.AppendChild(signatureDocument.CreateElement("xades", "XAdESSignatures", NavneromUtility.UriEtsi121));
             signatureDocument.DocumentElement.SetAttribute("xmlns", NavneromUtility.UriEtsi132);
 
-            //Todo: Legg til foerst
             signatureDocument.InsertBefore(xmlDeclaration, signatureDocument.DocumentElement);
             return signatureDocument;
         }

Digipost.Signature.Api.Client.Direct.Tests/DirectClientTests.cs

@@ -48,7 +48,7 @@ public async Task ThrowsExceptionOnNoSender()
 
                 //Act
                 await directClient.Create(directJob);
-                
+
                 //Assert
                 Assert.Fail();
             }

Digipost.Signature.Api.Client.Portal.Tests/Digipost.Signature.Api.Client.Portal.Tests.csproj

@@ -86,6 +86,7 @@
     <Compile Include="DataTransferObjects\DataTransferObjectConverterTests.cs" />
     <Compile Include="Extensions\EnumExtensionsTests.cs" />
     <Compile Include="Fakes\FakeHttpClientHanderForBrokerNotAuthorizedErrorResponse.cs" />
+    <Compile Include="Fakes\FakeHttpClientHandlerChecksCorrectSenderResponse.cs" />
     <Compile Include="Fakes\FakeHttpClientHandlerForJobCompletedResponse.cs" />
     <Compile Include="Fakes\FakeHttpClientHandlerForEmptyQueueResponse.cs" />
     <Compile Include="Fakes\FakeHttpClientHandlerForJobStatusChangeResponse.cs" />

Digipost.Signature.Api.Client.Portal.Tests/Fakes/FakeHttpClientHandlerChecksCorrectSenderResponse.cs

@@ -0,0 +1,25 @@
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Digipost.Signature.Api.Client.Core.Tests.Fakes;
+using Digipost.Signature.Api.Client.Portal.Tests.Utilities;
+
+namespace Digipost.Signature.Api.Client.Portal.Tests.Fakes
+{
+    internal class FakeHttpClientHandlerChecksCorrectSenderResponse : FakeHttpClientHandlerResponse
+    {
+        public string RequestUri { get; internal set; }
+
+        protected override async Task<HttpResponseMessage> SendAsync(
+            HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            RequestUri = request.RequestUri.ToString();
+            return await base.SendAsync(request, cancellationToken);
+        }
+
+        public override HttpContent GetContent()
+        {
+            return new StringContent(ResponseUtility.GetJobStatusChangeResponse());
+        }
+    }
+}

Digipost.Signature.Api.Client.Portal.Tests/PortalClientTests.cs

@@ -27,18 +27,17 @@ internal HttpClient GetHttpClientWithHandler(DelegatingHandler delegatingHandler
         public class CreateMethod : PortalClientTests
         {
             [TestMethod]
-            [ExpectedException(typeof(SenderNotSpecifiedException))]
+            [ExpectedException(typeof (SenderNotSpecifiedException))]
             public async Task ThrowsExceptionOnNoSender()
             {
                 //Arrange
                 var clientConfiguration = new ClientConfiguration(Environment.DifiQa, CoreDomainUtility.GetPostenTestCertificate());
                 var portalClient = new PortalClient(clientConfiguration);
-                var portalJob = new PortalJob(CoreDomainUtility.GetDocument(),CoreDomainUtility.GetSigners(1), "SendersReference");
+                var portalJob = new PortalJob(CoreDomainUtility.GetDocument(), CoreDomainUtility.GetSigners(1), "SendersReference");
 
                 //Act
                 await portalClient.Create(portalJob);
 
-
                 //Assert
                 Assert.Fail();
             }
@@ -47,6 +46,64 @@ public async Task ThrowsExceptionOnNoSender()
         [TestClass]
         public class GetStatusChangeMethod : PortalClientTests
         {
+            [TestMethod]
+            [ExpectedException(typeof (SenderNotSpecifiedException))]
+            public async Task ThrowsExceptionOnSenderNotSpecified()
+            {
+                //Arrange
+                var clientConfiguration = new ClientConfiguration(Environment.DifiQa, CoreDomainUtility.GetPostenTestCertificate());
+                var fakeHttpClientHandlerChecksCorrectSender = new FakeHttpClientHandlerForJobStatusChangeResponse();
+                var portalClient = new PortalClient(clientConfiguration)
+                {
+                    HttpClient = GetHttpClientWithHandler(fakeHttpClientHandlerChecksCorrectSender)
+                };
+
+                //Act
+                await portalClient.GetStatusChange();
+
+                //Assert
+                Assert.Fail();
+            }
+
+            [TestMethod]
+            public async Task CanBeCalledWithoutSenderUsesSenderInClientConfiguration()
+            {
+                //Arrange
+                var sender = CoreDomainUtility.GetSender();
+                var clientConfiguration = new ClientConfiguration(Environment.DifiQa, CoreDomainUtility.GetPostenTestCertificate(), sender);
+                var fakeHttpClientHandlerChecksCorrectSender = new FakeHttpClientHandlerChecksCorrectSenderResponse();
+                var portalClient = new PortalClient(clientConfiguration)
+                {
+                    HttpClient = GetHttpClientWithHandler(fakeHttpClientHandlerChecksCorrectSender)
+                };
+
+                //Act
+                await portalClient.GetStatusChange();
+
+                //Assert
+                Assert.IsTrue(fakeHttpClientHandlerChecksCorrectSender.RequestUri.Contains(sender.OrganizationNumber));
+            }
+
+            [TestMethod]
+            public async Task CalledWithBothSendersUsesInput()
+            {
+                //Arrange
+                var parameterSender = new Sender("000000000");
+                var clientConfigurationSender = new Sender("999999999");
+                var clientConfiguration = new ClientConfiguration(Environment.DifiQa, CoreDomainUtility.GetPostenTestCertificate(), clientConfigurationSender);
+                var fakeHttpClientHandlerChecksCorrectSender = new FakeHttpClientHandlerChecksCorrectSenderResponse();
+                var portalClient = new PortalClient(clientConfiguration)
+                {
+                    HttpClient = GetHttpClientWithHandler(fakeHttpClientHandlerChecksCorrectSender)
+                };
+
+                //Act
+                await portalClient.GetStatusChange(parameterSender);
+
+                //Assert
+                Assert.IsTrue(fakeHttpClientHandlerChecksCorrectSender.RequestUri.Contains(parameterSender.OrganizationNumber));
+            }
+
             [TestMethod]
             public async Task ReturnsEmptyObjectOnEmptyQueue()
             {

Digipost.Signature.Api.Client.Portal.Tests/Utilities/DomainUtility.cs

@@ -23,7 +23,14 @@ public static Availability GetAvailability()
 
         public static PortalJob GetPortalJob(int signers)
         {
-            return new PortalJob(CoreDomainUtility.GetDocument(), CoreDomainUtility.GetSigners(signers), "PortalJobReference");
+            return new PortalJob(CoreDomainUtility.GetDocument(), CoreDomainUtility.GetSigners(signers), "PortalJobReference")
+            {
+                Availability = new Availability
+                {
+                    Activation = DateTime.Now,
+                    AvailableFor = new TimeSpan(0, 0, 10, 0)
+                }
+            };
         }
 
         internal static PortalManifest GetPortalManifest()

Digipost.Signature.Api.Client.Portal/Internal/AsicE/AsiceGenerator.cs

@@ -8,11 +8,14 @@ namespace Digipost.Signature.Api.Client.Portal.Internal.AsicE
 {
     internal class AsiceGenerator
     {
-        public static DocumentBundle CreateAsice(Sender sender, Document document, IEnumerable<Signer> signers, X509Certificate2 certificate)
+        public static DocumentBundle CreateAsice(Sender sender, Document document, IEnumerable<Signer> signers, Availability availability, X509Certificate2 certificate)
         {
-            var manifest = new PortalManifest(sender, document, signers);
-            var signature = new SignatureGenerator(certificate, document, manifest);
+            var manifest = new PortalManifest(sender, document, signers)
+            {
+                Availability = availability
+            };
 
+            var signature = new SignatureGenerator(certificate, document, manifest);
             var asiceArchive = new AsiceArchive(document, signature, manifest);
 
             return new DocumentBundle(asiceArchive.Bytes);

Digipost.Signature.Api.Client.Portal/PortalClient.cs

@@ -32,8 +32,8 @@ public async Task<PortalJobResponse> Create(PortalJob portalJob)
         {
             var sender = CurrentSender(portalJob.Sender);
             var relativeUrl = RelativeUrl(sender);
-            
-            var documentBundle = AsiceGenerator.CreateAsice(ClientConfiguration.Sender, portalJob.Document, portalJob.Signers, ClientConfiguration.Certificate);
+
+            var documentBundle = AsiceGenerator.CreateAsice(sender, portalJob.Document, portalJob.Signers, portalJob.Availability, ClientConfiguration.Certificate);
             var portalCreateAction = new PortalCreateAction(portalJob, documentBundle);
             var portalJobResponse = await RequestHelper.Create(relativeUrl, portalCreateAction.Content(), PortalCreateAction.DeserializeFunc);
 
@@ -42,13 +42,13 @@ public async Task<PortalJobResponse> Create(PortalJob portalJob)
             return portalJobResponse;
         }
 
-        public async Task<PortalJobStatusChangeResponse> GetStatusChange()
+        public async Task<PortalJobStatusChangeResponse> GetStatusChange(Sender sender = null)
         {
             PortalJobStatusChangeResponse portalJobStatusChangeResponse;
 
             var request = new HttpRequestMessage
             {
-                RequestUri = RelativeUrl(CurrentSender(null)),
+                RequestUri = RelativeUrl(CurrentSender(sender)),
                 Method = HttpMethod.Get
             };
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));

Digipost.Signature.Api.Client.Portal/PortalJob.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Digipost.Signature.Api.Client.Core;
 using Digipost.Signature.Api.Client.Core.Internal;
 
@@ -23,6 +22,6 @@ public PortalJob(Document document, IEnumerable<Signer> signers, string referenc
 
         public Sender Sender { get; }
 
-        public DateTime DistributionTime { get; }
+        public Availability Availability { get; set; }
     }
 }