1 files changed, 37 insertions, 8 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
index 5625a30d..ae4dfb30 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
@@ -5,6 +5,7 @@ import javax.annotation.Nullable;
 import org.springframework.lang.NonNull;
 
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+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.service.RegisterSearchService.RegisterSearchResult;
 import at.gv.egiz.eaaf.core.api.IRequest;
@@ -41,34 +42,62 @@ public class MatchingTaskUtils {
   }
   
   /**
-   * Get Matching result from session.
+   * Get intermediate matching result from session.
    * 
    * @param pendingReq Current pendingRequest
-   * @return Matching result or <code>null</code> if not exist
+   * @return Intermediate matching result or <code>null</code> if not exist
    */
   @Nullable
-  public static RegisterSearchResult getInitialRegisterResult(IRequest pendingReq) {
-    return getAuthProcessDataWrapper(pendingReq).getGenericDataFromSession(Constants.DATA_INITIAL_REGISTER_RESULT,
+  public static RegisterSearchResult getIntermediateMatchingResult(IRequest pendingReq) {
+    return getAuthProcessDataWrapper(pendingReq).getGenericDataFromSession(Constants.DATA_INTERMEDIATE_RESULT,
         RegisterSearchResult.class);
     
   }
   
   /**
-   * Store matching result into session.
+   * Store intermediate matching result into session.
    * 
    * @param pendingReq Current pendingRequest
-   * @param registerData Matching result information
+   * @param registerData Intermediate matching result information
    * @throws EaafStorageException In case of data can not be add into session
    */
   @Nullable
-  public static void storeInitialRegisterResult(IRequest pendingReq, RegisterSearchResult registerData) 
+  public static void storeIntermediateMatchingResult(IRequest pendingReq, RegisterSearchResult registerData) 
       throws EaafStorageException {
     getAuthProcessDataWrapper(pendingReq).setGenericDataToSession(
-        Constants.DATA_INITIAL_REGISTER_RESULT, registerData);
+        Constants.DATA_INTERMEDIATE_RESULT, registerData);
         
   }
 
   /**
+   * Get intermediate matching result from session.
+   * 
+   * @param pendingReq Current pendingRequest
+   * @return Intermediate matching result or <code>null</code> if not exist
+   */
+  @Nullable
+  public static MatchedPersonResult getFinalMatchingResult(IRequest pendingReq) {
+    return getAuthProcessDataWrapper(pendingReq).getGenericDataFromSession(Constants.DATA_PERSON_MATCH_RESULT,
+        MatchedPersonResult.class);
+    
+  }
+  
+  /**
+   * Store intermediate matching result into session.
+   * 
+   * @param pendingReq Current pendingRequest
+   * @param personInfos Person information after a successful match
+   * @throws EaafStorageException In case of data can not be add into session
+   */
+  @Nullable
+  public static void storeFinalMatchingResult(IRequest pendingReq, MatchedPersonResult personInfos) 
+      throws EaafStorageException {
+    getAuthProcessDataWrapper(pendingReq).setGenericDataToSession(
+        Constants.DATA_PERSON_MATCH_RESULT, personInfos);
+        
+  }
+  
+  /**
    * Get holder for authentication information for the current process.
    * 
    * @param pendingReq Current pendingRequest