1 files changed, 4 insertions, 25 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
index c95c275e..740e5292 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -86,9 +86,6 @@ import szrservices.IdentityLinkType;
  * <ul>
  *     <li>{@link at.gv.egiz.eaaf.core.impl.idp.controller.tasks.FinalizeAuthenticationTask}</li>
  * </ul>
- * TODO Take Constants#DATA_SIMPLE_EIDAS and Constants#DATA_RESULT_MATCHING_BPK
- * TODO Only do VSZ Erstellung and eidasBind -- this is always the end of the whole process
- * TODO Move Eintragung to separate Task, as it does not happen every time
  * @author tlenz
  */
 @Slf4j
@@ -192,16 +189,8 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
   private void executeEidMode(SimpleEidasData eidData, MatchedPersonResult matchedPersonData)
       throws JsonProcessingException, EaafException, JoseException {
     // get encrypted baseId
-    String vsz;
-    if (matchedPersonData != null) {
-      log.debug("Requesting encrypted baseId by already matched person information ... ");
-      vsz = szrClient.getEncryptedStammzahl(matchedPersonData);
-
-    } else {
-      log.debug("Requesting encrypted baseId by using eIDAS information directly ... ");
-      vsz = szrClient.createNewErnpEntry(eidData);
-
-    }
+    log.debug("Requesting encrypted baseId by already matched person information ... ");
+    String vsz = szrClient.getEncryptedStammzahl(matchedPersonData);
 
     //write revision-Log entry and extended infos personal-identifier mapping
     revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.SZR_VSZ_RECEIVED);
@@ -252,18 +241,8 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
   private SzrResultHolder requestSzrForIdentityLink(SimpleEidasData eidData,
       MatchedPersonResult matchedPersonData) throws EaafException {
     //request IdentityLink from SZR
-    IdentityLinkType result;
-
-    if (matchedPersonData != null) {
-      log.debug("Requesting encrypted baseId by already matched person information ... ");
-      result = szrClient.getIdentityLinkInRawMode(matchedPersonData);
-
-    } else {
-      log.debug("Requesting encrypted baseId by using eIDAS information directly ... ");
-      result = szrClient.getIdentityLinkInRawMode(eidData);
-
-    }
-
+    log.debug("Requesting encrypted baseId by already matched person information ... ");
+    IdentityLinkType result = szrClient.getIdentityLinkInRawMode(matchedPersonData);
 
     final Element idlFromSzr = (Element) result.getAssertion();
     final IIdentityLink identityLink = new SimpleIdentityLinkAssertionParser(idlFromSzr).parseIdentityLink();