1 files changed, 8 insertions, 41 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
index 0b6e9ee8..92f58877 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
@@ -41,10 +41,8 @@ import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ICcSpecificEidProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
 import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
@@ -87,9 +85,6 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
       throws TaskExecutionException {
 
     try {
-      // get service-provider configuration
-      final ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
-
       // get target, environment and validate citizen countryCode
       final String citizenCountryCode = (String) executionContext.get(
           MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
@@ -110,6 +105,13 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
       final LightRequest.Builder authnRequestBuilder = LightRequest.builder();
       authnRequestBuilder.id(UUID.randomUUID().toString());
 
+      // set nameIDFormat
+      authnRequestBuilder.nameIdFormat(Constants.eIDAS_REQ_NAMEID_FORMAT);
+
+      // set citizen country code for foreign uses
+      authnRequestBuilder.citizenCountryCode(citizenCountryCode);
+      
+      //set Issuer
       final String issur = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID);
       if (StringUtils.isEmpty(issur)) {
         log.error("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
@@ -119,42 +121,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
       }
       authnRequestBuilder.issuer(issur);
 
-      // TODO: set matching mode if eIDAS ref. impl. support this method
-
-      // TODO: update if eIDAS ref. impl. supports exact matching for non-notified LoA
-      // schemes
-      String loa = EaafConstants.EIDAS_LOA_HIGH;
-      if (spConfig.getRequiredLoA() != null) {
-        if (spConfig.getRequiredLoA().isEmpty()) {
-          log.info("No eIDAS LoA requested. Use LoA HIGH as default");
-        } else {
-          if (spConfig.getRequiredLoA().size() > 1) {
-            log.info(
-                "Currently only ONE requested LoA is supported for service provider. Use first one ... ");
-          }
-
-          loa = spConfig.getRequiredLoA().get(0);
-
-        }
-      }
-
-      log.debug("Request eIdAS node with LoA: " + loa);
-      authnRequestBuilder.levelOfAssurance(loa);
-
-      // set nameIDFormat
-      authnRequestBuilder.nameIdFormat(Constants.eIDAS_REQ_NAMEID_FORMAT);
-
-      // set citizen country code for foreign uses
-      authnRequestBuilder.citizenCountryCode(citizenCountryCode);
-
-      // set relay state
-      /*
-       * TODO: SecureToken PendingRequestId generates a validation exception in
-       * eIDASNode because eIDASNode implements limit on size for RelayState
-       * (80characaters)
-       */
-      // authnRequestBuilder.relayState(pendingReq.getPendingRequestId());
-
+      
       // Add country-specific informations into eIDAS request
       ccSpecificProcessing.preProcess(citizenCountryCode, pendingReq, authnRequestBuilder);