Merge branch 'nightlybuild' into feature/matching_base

# Conflicts:
#	connector/pom.xml
#	connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
#	pom.xml

2 files changed, 25 insertions, 6 deletions

diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
index 890d4b19..b9525de5 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
@@ -13,6 +13,9 @@ import java.time.Instant;
 import java.util.Map;
 import java.util.Timer;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.TransformerException;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -103,7 +106,10 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
+import szrservices.GetIdentityLinkEidasResponse;
+import szrservices.PersonInfoType;
 import szrservices.SZR;
+import szrservices.SZRException_Exception;
 import szrservices.SignContentEntry;
 import szrservices.SignContentResponseType;
 
@@ -442,8 +448,8 @@ public class FullStartUpAndProcessTest {
   }
 
   private void injectSzrResponse() throws Exception {
-
     when(szrMock.getStammzahlEncrypted(any(), any())).thenReturn(vsz);
+
     val signContentResp = new SignContentResponseType();
     final SignContentEntry signContentEntry = new SignContentEntry();
     signContentEntry.setValue(eidasBind);
@@ -582,4 +588,17 @@ public class FullStartUpAndProcessTest {
     metadataProvider.addMetadataResolverIntoChain(fileSystemResolver);
 
   }
+  
+  private void setSzrResponseIdentityLink(String responseXmlPath) throws JAXBException, SZRException_Exception {
+    final JAXBContext jaxbContext = JAXBContext
+        .newInstance(szrservices.ObjectFactory.class, org.w3._2001._04.xmldsig_more.ObjectFactory.class,
+                     org.w3._2000._09.xmldsig.ObjectFactory.class,
+                     at.gv.e_government.reference.namespace.persondata._20020228.ObjectFactory.class);
+    final Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+    final GetIdentityLinkEidasResponse szrResponse = (GetIdentityLinkEidasResponse) jaxbUnmarshaller
+        .unmarshal(this.getClass().getResourceAsStream(responseXmlPath));        
+    org.mockito.Mockito.when(szrMock.getIdentityLinkEidas(any(PersonInfoType.class))).thenReturn(szrResponse.getGetIdentityLinkReturn());
+
+  }
+  
 }
diff --git a/connector/src/test/resources/config/templates/countrySelection.html b/connector/src/test/resources/config/templates/countrySelection.html
index bac2bb9c..02d01399 100644
--- a/connector/src/test/resources/config/templates/countrySelection.html
+++ b/connector/src/test/resources/config/templates/countrySelection.html
@@ -253,11 +253,11 @@
         <span th:text="#{gui.countryselection.infos.general.part.4}"> fourth part </span>
     </p>
 
-    <p
-    <span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span>
-    <a href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank"
-       th:text="#{gui.countryselection.infos.general.link.2}"></a>
-    <span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span>
+    <p>
+    	<span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span>
+    	<a 	href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank"
+       		th:text="#{gui.countryselection.infos.general.link.2}"></a>
+    	<span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span>
     </p>
 
 </div>