1 files changed, 22 insertions, 6 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
index 18ddab42..ce737526 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -150,12 +150,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
         if (pendingReq.getServiceProviderConfiguration()
             .isConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_NEW_EID_MODE, false)) {
           
-          // work-around, because getEncryptedStammzahl does not support insertERnP for eIDAS entities
-          SzrResultHolder idlResult = requestSzrForIdentityLink(personInfo);
-                              
-          // get encrypted baseId
-          String vsz = szrClient.getEncryptedStammzahl(buildGetEncryptedBaseIdReq(idlResult.identityLink));
-                    
+          // get VSZ
+          String vsz = getVszForPerson(personInfo);
+                                                         
           //write revision-Log entry and extended infos personal-identifier mapping
           revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.SZR_VSZ_RECEIVED);
           writeExtendedRevisionLogEntry(simpleAttrMap, eidData);
@@ -224,6 +221,25 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
     }
   }
 
+
+  private String getVszForPerson(PersonInfoType personInfo) throws SzrCommunicationException, EaafException {
+    if (basicConfig.getBasicConfigurationBoolean(
+        Constants.CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_IDA_VSZ_IDL, true)) {
+      log.debug("IDA workaround is active. Requesting IDL to insert person into ERnP .... ");
+      
+      // work-around, because getEncryptedStammzahl does not support insertERnP for eIDAS entities
+      SzrResultHolder idlResult = requestSzrForIdentityLink(personInfo);
+                                   
+      // get encrypted baseId
+      return szrClient.getEncryptedStammzahl(buildGetEncryptedBaseIdReq(idlResult.identityLink));
+      
+                 
+    } else {
+      return szrClient.getEncryptedStammzahl(personInfo, true);  
+      
+    }
+  }
+
   private PersonInfoType buildGetEncryptedBaseIdReq(IIdentityLink identityLink) throws EaafBuilderException {
     log.debug("Generating getVsz request from identityLink information ... ");
     final PersonInfoType personInfo = new PersonInfoType();