1 files changed, 11 insertions, 6 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
index 93dbc7c2..d8c14b8e 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
@@ -183,7 +183,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
         eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTFAMILYNAME)));
     simpleEidasData.setGivenName(EidasResponseUtils.processGivenName(
         eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTGIVENNAME)));
-    simpleEidasData.setDateOfBirth(EidasResponseUtils.processDateOfBirth(
+    simpleEidasData.setDateOfBirth(EidasResponseUtils.processDateOfBirthToString(
         eidasAttrMap.get(Constants.eIDAS_ATTR_DATEOFBIRTH)));
 
     // additional attributes
@@ -265,12 +265,17 @@ public class InitialSearchTask extends AbstractAuthServletTask {
   }
 
   private String step7a(MergedRegisterSearchResult initialSearchResult,
-                      CountrySpecificDetailSearchResult countrySpecificDetailSearchResult, SimpleEidasData eidData) {
+                        CountrySpecificDetailSearchResult countrySpecificDetailSearchResult,
+                        SimpleEidasData eidData) throws TaskExecutionException {
     //TODO automerge
     log.debug("Automerge " + initialSearchResult + " with " + eidData + " " + countrySpecificDetailSearchResult);
     //TODO
-    String bpK = "103";
-    return bpK;
+    try {
+      String bpK = countrySpecificDetailSearchResult.getBpk();
+      return bpK;
+    } catch (WorkflowException e) {
+      throw new TaskExecutionException(pendingReq, "Step7a failed.", e);
+    }
   }
 
   private String step8(MergedRegisterSearchResult initialSearchResult,
@@ -278,11 +283,11 @@ public class InitialSearchTask extends AbstractAuthServletTask {
     MergedRegisterSearchResult mdsSearchResult = new MergedRegisterSearchResult();
 
     ArrayList<RegisterResult> resultsZmr =
-        zmrClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getFormatedDateOfBirth());
+        zmrClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth());
     mdsSearchResult.setResultsZmr(resultsZmr);
 
     ArrayList<RegisterResult> resultsErnb =
-        ernbClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getFormatedDateOfBirth());
+        ernbClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth());
     mdsSearchResult.setResultsErnb(resultsErnb);
 
     log.debug("Automerge " + initialSearchResult + " with " + eidData + " " + mdsSearchResult);