From 440dcedcfb17e05e439d3019a8cfdb27c307123d Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 17 Mar 2022 08:17:14 +0100
Subject: test(core): fix integration test with included work-around for IDA
 mode

---
 .../connector/test/FullStartUpAndProcessTest.java   | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'connector/src')

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 64e8272e..c56ac1ef 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
@@ -11,6 +11,9 @@ import java.net.URISyntaxException;
 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;
@@ -85,7 +88,10 @@ import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 import lombok.val;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import szrservices.GetIdentityLinkEidasResponse;
+import szrservices.PersonInfoType;
 import szrservices.SZR;
+import szrservices.SZRException_Exception;
 import szrservices.SignContentEntry;
 import szrservices.SignContentResponseType;
 
@@ -400,6 +406,8 @@ public class FullStartUpAndProcessTest {
 
   private void injectSzrResponse() throws Exception {
     
+    setSzrResponseIdentityLink("/data/szr/szr_resp_valid_1.xml");
+    
     when(szrMock, "getStammzahlEncrypted", any(), any()).thenReturn(vsz);
     val signContentResp = new SignContentResponseType();
     final SignContentEntry signContentEntry = new SignContentEntry();
@@ -493,4 +501,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());
+
+  }
+  
 }
-- 
cgit v1.2.3


From 49a945fa17ee06f38ddada441df7a1f29c58e317 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 1 Apr 2022 21:47:48 +0200
Subject: feat(szr): add configuration property to activate/deactivate
 work-around for insertErnp in case of IDA mode

---
 connector/src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'connector/src')

diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
index e7437840..73a258d7 100644
--- a/connector/src/main/resources/application.properties
+++ b/connector/src/main/resources/application.properties
@@ -100,7 +100,7 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
 
 #Raw eIDAS Id data storage
 eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
-
+eidas.ms.auth.eIDAS.szrclient.workarounds.use.getidentitylink.for.ida=true
 
 eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true
 eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true
-- 
cgit v1.2.3


From 791dc8acd7edbf22b98c2be111d420e61ebb39e6 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 5 Apr 2022 08:52:50 +0200
Subject: build(assembly): add histroy.txt into release package

---
 connector/src/assembly/assembly_dir.xml | 1 +
 connector/src/assembly/assembly_zip.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'connector/src')

diff --git a/connector/src/assembly/assembly_dir.xml b/connector/src/assembly/assembly_dir.xml
index 59437be6..bc12a470 100644
--- a/connector/src/assembly/assembly_dir.xml
+++ b/connector/src/assembly/assembly_dir.xml
@@ -44,6 +44,7 @@
         <!-- include>README.md</include-->
         <include>readme_${project.version}.txt</include>
         <include>readme_${project.version}.md</include>
+        <include>history.txt</include>
         <include>eIDAS_Ref_Impl/*</include>
         <include>handbook/*</include>
       </includes>
diff --git a/connector/src/assembly/assembly_zip.xml b/connector/src/assembly/assembly_zip.xml
index 43877283..dcb7dab0 100644
--- a/connector/src/assembly/assembly_zip.xml
+++ b/connector/src/assembly/assembly_zip.xml
@@ -44,6 +44,7 @@
         <!-- include>README.md</include -->
         <include>readme_${project.version}.txt</include>
         <include>readme_${project.version}.md</include>
+        <include>history.txt</include>
         <include>eIDAS_Ref_Impl/*</include>
         <include>handbook/*</include>
       </includes>
-- 
cgit v1.2.3