1 files changed, 6 insertions, 20 deletions
diff --git a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
index a9cc998e..56b34257 100644
--- a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
+++ b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
@@ -29,6 +29,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
 import at.asitplus.eidas.specific.modules.msproxyservice.exception.EidasProxyServiceException;
+import at.asitplus.eidas.specific.modules.msproxyservice.utils.EidasProxyServiceUtils;
 import at.gv.egiz.components.eventlog.api.EventConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -261,7 +262,8 @@ public class EidasProxyServiceController extends AbstractController implements I
       throws EidasProxyServiceException {    
     // check if natural-person and legal-person attributes requested in parallel
     if (spConfig.isConfigurationValue(MsProxyServiceConstants.CONIG_PROPS_CONNECTOR_VALIDATION_ATTR_MDS, true) 
-        && isLegalPersonRequested(eidasRequest) && isNaturalPersonRequested(eidasRequest)) {
+        && EidasProxyServiceUtils.isLegalPersonRequested(eidasRequest) 
+        && EidasProxyServiceUtils.isNaturalPersonRequested(eidasRequest)) {
       throw new EidasProxyServiceException(ERROR_08, null);
       
     }
@@ -382,7 +384,7 @@ public class EidasProxyServiceController extends AbstractController implements I
       injectMandateInfosIntoSpConfig(spConfig, eidasRequest);
                  
     } else {            
-      if (isLegalPersonRequested(eidasRequest)) {
+      if (EidasProxyServiceUtils.isLegalPersonRequested(eidasRequest)) {
         throw new EidasProxyServiceException(ERROR_09, null);
         
       } 
@@ -400,7 +402,7 @@ public class EidasProxyServiceController extends AbstractController implements I
         spConfig.getUniqueIdentifier());
 
     //check if legal person is requested
-    boolean isLegalPersonRequested = isLegalPersonRequested(eidasRequest);
+    boolean isLegalPersonRequested = EidasProxyServiceUtils.isLegalPersonRequested(eidasRequest);
             
     // set mandate profiles 
     if (isLegalPersonRequested) {
@@ -409,7 +411,7 @@ public class EidasProxyServiceController extends AbstractController implements I
       
       spConfig.setMandateMode(SpMandateModes.LEGAL_FORCE);
       
-    } else if (isNaturalPersonRequested(eidasRequest)) {
+    } else if (EidasProxyServiceUtils.isNaturalPersonRequested(eidasRequest)) {
       spConfig.setMandateProfiles(KeyValueUtils.getListOfCsvValues(
           spConfig.getConfigurationValue(MsProxyServiceConstants.CONIG_PROPS_CONNECTOR_MANDATES_PROFILE_NATURAL)));
       
@@ -433,20 +435,4 @@ public class EidasProxyServiceController extends AbstractController implements I
     }
     
   }
-
-  private boolean isLegalPersonRequested(ILightRequest eidasRequest) {
-    return eidasRequest.getRequestedAttributes().entrySet().stream()
-        .filter(el -> el.getKey().getFriendlyName().equals(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER))
-        .findFirst()
-        .isPresent();
-    
-  }
-  
-  private boolean isNaturalPersonRequested(ILightRequest eidasRequest) {
-    return eidasRequest.getRequestedAttributes().entrySet().stream()
-        .filter(el -> el.getKey().getFriendlyName().equals(Constants.eIDAS_ATTR_PERSONALIDENTIFIER))
-        .findFirst()
-        .isPresent();
-    
-  }
 }