1 files changed, 35 insertions, 23 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
index 6fc6d499..c7843be5 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
@@ -26,9 +26,16 @@ package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.ernp.ErnpRestClient;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.ernp.ErnpRestClient.ErnpRegisterResult;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.WorkflowException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
@@ -46,6 +53,7 @@ import lombok.extern.slf4j.Slf4j;
  *   <li>TODO MDS, BPK of new entry</li>
  * </ul>
  *
+ * @author tlenz
  * @author amarsalek
  * @author ckollmann
  */
@@ -53,36 +61,40 @@ import lombok.extern.slf4j.Slf4j;
 @Component("CreateNewErnbEntryTask")
 public class CreateNewErnpEntryTask extends AbstractAuthServletTask {
 
-  //private final SzrClient szrClient;
+  private final ErnpRestClient ernpClient;
 
-  ///**
-  // * Constructor.
-  // * @param szrClient SZR client for creating a new ERnP entry
-  // */
-  //public CreateNewErnpEntryTask(SzrClient szrClient) {
-  //  this.szrClient = szrClient;
-  //}
+  /**
+   * Constructor.
+   * @param client SZR client for creating a new ERnP entry
+   */
+  public CreateNewErnpEntryTask(@Autowired ErnpRestClient client) {
+    this.ernpClient = client;
+  }
 
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
     try {
-      //SimpleEidasData simpleEidasData = MatchingTaskUtils.getInitialEidasData(pendingReq);   
-          
-      // insert person into ERnP
-      //TODO: should we insert it directly into ERnP?
-      //TODO: has to updated to new eIDAS document model in ERnP
-      //String vsz = szrClient.createNewErnpEntry(simpleEidasData);
-
-      // finish matching process, because new user-entry uniquly matches
-      //log.info("User successfully registerred into ERnP and matching tasks are finished ");
-      //MatchingTaskUtils.storeFinalMatchingResult(pendingReq, 
-      //    MatchedPersonResult.builder()
-      //        .vsz(vsz)
-      //        .build());
-      
-      log.warn("Skipping new insert ERnP task, because it's currently unknown who we should it");
+      SimpleEidasData simpleEidasData = MatchingTaskUtils.getInitialEidasData(pendingReq);            
+      if (simpleEidasData == null) {
+        throw new WorkflowException("step09", "No initial eIDAS authn data", true);
+        
+      }
       
+      //add person into ERnP
+      ErnpRegisterResult resp = ernpClient.add(simpleEidasData);
+      if (resp.getPersonResult().size() != 1) {
+        log.error("Receive {} from ERnP during 'add person' step", 
+            resp.getPersonResult().isEmpty() ? "no result" : "more-than-one result");
+        throw new WorkflowException("step09", "Add person into ERnP failed", true);
+        
+      }
+           
+      // finish matching process, because new user-entry uniquly matches
+      log.info("User successfully registerred into ERnP and matching tasks are finished ");
+      MatchingTaskUtils.storeFinalMatchingResult(pendingReq, 
+          MatchedPersonResult.generateFormMatchingResult(
+              resp.getPersonResult().get(0), simpleEidasData.getCitizenCountryCode()));
 
     } catch (final Exception e) {
       log.error("Initial search FAILED.", e);