1 files changed, 22 insertions, 11 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
index b38c3678..f49ed203 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
@@ -68,7 +68,7 @@ import eu.eidas.auth.commons.tx.BinaryLightToken;
 import eu.eidas.specificcommunication.BinaryLightTokenHelper;
 import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
 import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
-import eu.eidas.specificcommunication.protocol.impl.SpecificConnectorCommunicationServiceImpl;
+import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 
 /**
  * @author tlenz
@@ -153,14 +153,25 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 				log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PublicSector'");
 				authnRequestBuilder.spType(SpType.PUBLIC.getValue());
 
-				//TODO: only for eIDAS ref. node 2.0 and 2.1 because it need 'Providername' for any SPType 
-				String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
-				if (StringUtils.isNotEmpty(providerName) 
-						&& basicConfig.getBasicConfigurationBoolean(
-								Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME, 
-								false)
-						)
-					authnRequestBuilder.providerName(providerName);
+				if ( basicConfig.getBasicConfigurationBoolean(
+						Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, 
+						false) ) {
+					authnRequestBuilder.providerName(basicConfig.getBasicConfiguration(
+							Constants.CONIG_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, 
+							Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP));
+					
+				} else {				
+					//TODO: only for eIDAS ref. node 2.0 and 2.1 because it need 'Providername' for any SPType				 
+					String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
+					if ( StringUtils.isNotEmpty(providerName) 
+							&& basicConfig.getBasicConfigurationBoolean(
+									Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME, 
+									false)
+						) {
+						authnRequestBuilder.providerName(providerName);
+					
+					}
+				}
 				
 			} else {
 				log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PrivateSector'");
@@ -316,8 +327,8 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
     private BinaryLightToken putRequestInCommunicationCache(ILightRequest iLightRequest) throws ServletException {
         final BinaryLightToken binaryLightToken;
         try {
-            final SpecificConnectorCommunicationServiceImpl springManagedSpecificConnectorCommunicationService =
-                    (SpecificConnectorCommunicationServiceImpl) context.getBean(SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
+            final SpecificCommunicationService springManagedSpecificConnectorCommunicationService =
+                    (SpecificCommunicationService) context.getBean(SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
 
             binaryLightToken = springManagedSpecificConnectorCommunicationService.putRequest(iLightRequest);