Merge pull request #212 from difi/256-tegn-i-emne

256 tegn tillatt i emne

Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs

@@ -7,7 +7,7 @@ namespace Difi.SikkerDigitalPost.Klient.Domene.Exceptions
     public class XmlValidationException : SikkerDigitalPostException
     {
         public XmlValidationException(string message, List<string> validationMessages)
-            : base(message)
+            : base(message + validationMessages)
         {
             ValidationMessages = validationMessages;
         }

Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs

@@ -28,8 +28,7 @@ public class ConstructorMethod : SikkerDigitalPostKlientTests
             public void Initializes_fields()
             {
                 //Arrange
-                var difiOrgNr = "991825827";
-                var databehandler = new Databehandler(new Organisasjonsnummer(difiOrgNr), DomainUtility.GetAvsenderCertificate());
+                var databehandler = new Databehandler(DomainUtility.Organisasjonsnummer(), DomainUtility.GetAvsenderCertificate());
                 var klientkonfigurasjon = new Klientkonfigurasjon(Miljø.FunksjoneltTestmiljø);
 
                 //Act

Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs

@@ -15,7 +15,7 @@ public SmokeTests()
             _t = new SmokeTestsHelper(miljø);
         }
 
-        [Fact(Skip = "Skipping because it requires working certificates")]
+        [Fact]
         public void Send_digital_with_multiple_documents()
         {
             _t
@@ -27,7 +27,7 @@ public void Send_digital_with_multiple_documents()
                 .ConfirmReceipt();
         }
 
-        [Fact(Skip = "Skipping because it requires working certificates")]
+        [Fact]
         public void Send_physical()
         {
             _t
@@ -39,7 +39,7 @@ public void Send_physical()
                 .ConfirmReceipt();
         }
 
-        [Fact(Skip = "Skipping because it requires working certificates")]
+        [Fact]
         public void Send_on_behalf_of()
         {
             _t

Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs

@@ -16,7 +16,6 @@ namespace Difi.SikkerDigitalPost.Klient.Tester
     internal class SmokeTestsHelper
     {
         private static readonly Organisasjonsnummer DifiOrganisasjonsnummer = new Organisasjonsnummer("991825827");
-        private const string DifiThumbprint = "88bdb74fadaed87f52d2f5c11aed607deb9700ba";// "b0cb922214d11e8ce993838db4c6d04c0c0970b8";
         private readonly SikkerDigitalPostKlient _klient;
 
         private Forsendelse _forsendelse;
@@ -25,7 +24,7 @@ internal class SmokeTestsHelper
 
         public SmokeTestsHelper(Miljø miljø)
         {
-            _klient = new SikkerDigitalPostKlient(new Databehandler(DifiOrganisasjonsnummer, DifiThumbprint), new Klientkonfigurasjon(miljø));
+            _klient = new SikkerDigitalPostKlient(new Databehandler(DomainUtility.Organisasjonsnummer(), DomainUtility.GetAvsenderCertificate()), new Klientkonfigurasjon(miljø));
         }
 
         public SmokeTestsHelper Create_Digital_Forsendelse_with_multiple_documents()

Difi.SikkerDigitalPost.Klient.Tester/Utilities/DomainUtility.cs

@@ -85,8 +85,12 @@ internal static string GetMimeType(string fileName)
 
         internal static Avsender GetAvsender()
         {
-            var orgnrDifi = new Organisasjonsnummer("991825827");
-            return new Avsender(orgnrDifi);
+            return new Avsender(Organisasjonsnummer());
+        }
+
+        internal static Organisasjonsnummer Organisasjonsnummer()
+        {
+            return new Organisasjonsnummer("988015814");
         }
 
         internal static string GetPersonnummerMottaker()
@@ -258,7 +262,7 @@ private static X509Certificate2 GetEternalTestCertificateMedPrivateKey()
 
         internal static X509Certificate2 GetAvsenderCertificate()
         {
-            string difiThumbprint = "88bdb74fadaed87f52d2f5c11aed607deb9700ba";//"‎b0cb922214d11e8ce993838db4c6d04c0c0970b8";
+            string difiThumbprint = "4addc8e8dc962889cf52c145860a017844e6399e"; //Bring Testintegrasjon, gyldig til november 2021
             return CertificateUtility.SenderCertificate(difiThumbprint, Language.Norwegian);
         }
 

Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd

@@ -93,7 +93,7 @@
   <xsd:simpleType name="TittelString">
     <xsd:restriction base="xsd:string">
       <xsd:minLength value="1" />
-      <xsd:maxLength value="100" />
+      <xsd:maxLength value="255" />
     </xsd:restriction>
   </xsd:simpleType>
 

SolutionItems/SharedAssemblyInfo.cs

@@ -4,8 +4,8 @@
 [assembly: AssemblyTrademark("Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyProduct("Difi Opppslagstjeneste Klient")]
 [assembly: AssemblyDescription("Klientbibliotek for integrasjon mot Oppslagstjenesten for kontakt og reservasjonregisteret")]
-[assembly: AssemblyVersion("2.0.4")]
-[assembly: AssemblyFileVersion("2.0.4")]
-[assembly: AssemblyInformationalVersion("2.0.4")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyInformationalVersion("2.1.0")]
 [assembly: AssemblyCopyright("© 2015-2016 Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyCulture("")]

SolutionItems/VersionInfo.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.5.*")]
+[assembly: AssemblyVersion("1.6.*")]
 #pragma warning disable CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision
 
-[assembly: AssemblyFileVersion("1.5.*")]
+[assembly: AssemblyFileVersion("1.6.*")]
 #pragma warning restore CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision

appveyor.yml

@@ -11,21 +11,17 @@
     - packages -> **\packages.config
   configuration: Release 
   environment:
-    strong_name_signingkey_secret:
-      secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs=
-    virksomhetssertifikat_secret:
-      secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs=
     virksomhetssertifikat_pass:
-      secure: 1GZYP7hef/X/3sNeNpGukg==
+      secure: eQknhCDP94FWkv9tOvX6LnWvdhZMPBaEDIbVTvCNi2g=
+    virksomhetssertifikat_secret:
+      secure: eQknhCDP94FWkv9tOvX6LnWvdhZMPBaEDIbVTvCNi2g=  
   install:
     - git submodule update --init --recursive
     - nuget install secure-file -ExcludeVersion
-    - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_signingkey_secret%
-    - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret%
+    - secure-file\tools\secure-file -decrypt Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc -secret %virksomhetssertifikat_secret%
   before_build:
   - ps: >-
-      .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat bring.p12;
-      .\appveyor-deploy\MoveSigningKey.ps1 -signingKeyPath "$env:APPVEYOR_BUILD_FOLDER\signingkey.snk" -signingKeyDestination "C:\Keys\signingkey.snk";
+      .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12;
       .\appveyor-deploy\NugetRestore.ps1;
       .\appveyor-deploy\AssemblyInfoVersionPatcher.ps1 -assemblyInfoPath  ".\SolutionItems\SharedAssemblyInfo.cs"; 
       .\appveyor-deploy\BuildPreamble.ps1   
@@ -61,21 +57,17 @@
     - packages -> **\packages.config
   configuration: Release 
   environment:
-    strong_name_signingkey_secret:
-      secure: klTrmUGElJ32M1IvA5ecksVOZoUhA22ZAEVhpi5qaZY=
     virksomhetssertifikat_secret:
       secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs=
     virksomhetssertifikat_pass:
       secure: 1GZYP7hef/X/3sNeNpGukg==  
   install:
     - git submodule update --init --recursive
     - nuget install secure-file -ExcludeVersion
-    - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_signingkey_secret%
-    - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret%
+    - secure-file\tools\secure-file -decrypt Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc -secret %virksomhetssertifikat_secret%
   before_build:
   - ps: >-
-      .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat bring.p12;
-      .\appveyor-deploy\MoveSigningKey.ps1 -signingKeyPath "$env:APPVEYOR_BUILD_FOLDER\signingkey.snk" -signingKeyDestination "C:\Keys\signingkey.snk";
+      .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12;
       .\appveyor-deploy\NugetRestore.ps1;
       .\appveyor-deploy\BuildPreamble.ps1          
   build: