1 files changed, 21 insertions, 21 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 c720cb7f..9564a8fc 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
@@ -122,8 +122,9 @@ public class InitialSearchTask extends AbstractAuthServletTask {
       if (resultCount == 0) {
         step6CountrySpecificSearch(executionContext, searchResult.getOperationStatus(), eidasData);
 
-      } else if (resultCount == 1) {
-        foundMatchFinalizeTask(searchResult, eidasData);
+      } else if (resultCount == 1) {        
+        RegisterResult updatedResult = step3CheckRegisterUpdateNecessary(searchResult, eidasData);        
+        foundMatchFinalizeTask(updatedResult, eidasData);
 
       } else {
         throw new WorkflowException("step2RegisterSearchWithPersonIdentifier",
@@ -146,10 +147,12 @@ public class InitialSearchTask extends AbstractAuthServletTask {
     if (searchResult.getResultCount() == 0) {
       log.trace("'step6CountrySpecificSearch' ends with no result. Forward to next matching step ... ");
       step8RegisterSearchWithMds(executionContext, searchResult.getOperationStatus(), eidasData);
+      
     } else if (searchResult.getResultCount() == 1) {
       log.trace("'step6CountrySpecificSearch' finds a person. Forward to 'step7aKittProcess' step ... ");
-      registerSearchService.step7aKittProcess(searchResult, eidasData);
-      foundMatchFinalizeTask(searchResult, eidasData);
+      RegisterStatusResults updatedResult = registerSearchService.step7aKittProcess(searchResult, eidasData);
+      foundMatchFinalizeTask(updatedResult.getResult(), eidasData);
+      
     } else {
       throw new WorkflowException("step6CountrySpecificSearch",
           "More than one entry with unique country-specific information", true);
@@ -172,29 +175,26 @@ public class InitialSearchTask extends AbstractAuthServletTask {
     }
   }
 
-  private void foundMatchFinalizeTask(RegisterStatusResults searchResult, SimpleEidasData eidasData)
-      throws WorkflowException, EaafStorageException {
-    RegisterResult updatedResult = step3CheckRegisterUpdateNecessary(searchResult.getResult(), eidasData);
-    MatchedPersonResult result = MatchedPersonResult.generateFormMatchingResult(
-        updatedResult, eidasData.getCitizenCountryCode());
-    MatchingTaskUtils.storeFinalMatchingResult(pendingReq, result);
-  }
-
-  private RegisterResult step3CheckRegisterUpdateNecessary(RegisterResult searchResult,
-                                                           SimpleEidasData eidasData) {
+  private RegisterResult step3CheckRegisterUpdateNecessary(
+      RegisterStatusResults searchResult, SimpleEidasData eidasData) throws WorkflowException {
     log.trace("Starting step3CheckRegisterUpdateNecessary");
-    if (!eidasData.equalsRegisterData(searchResult)) {
-      log.info("Skipping update-register-information step, because it's not supported yet");
-      
-      //TODO: update of ERnP information are allowed. Add ERnP update-step. Maybe we can use regular KITT steps
-            
+    if (!eidasData.equalsRegisterData(searchResult.getResult())) {
+      log.debug("PersonalIdentifier match but MDS or other information changed. Starting update process ... ");        
+      return registerSearchService.step7aKittProcess(searchResult, eidasData).getResult();
       
-      return searchResult;
     } else {
       log.debug("Register information match to eIDAS information. No update required");
-      return searchResult;
+      return searchResult.getResult();
     }
   }
+  
+  private void foundMatchFinalizeTask(RegisterResult updatedResult, SimpleEidasData eidasData)
+      throws WorkflowException, EaafStorageException {
+    MatchedPersonResult result = 
+        MatchedPersonResult.generateFormMatchingResult(updatedResult, eidasData.getCitizenCountryCode());
+    MatchingTaskUtils.storeFinalMatchingResult(pendingReq, result);
+    
+  }
 
   @NotNull
   private SimpleEidasData convertEidasAttrToSimpleData()