1 files changed, 7 insertions, 6 deletions
diff --git a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
index 33d9fdc0..15524005 100644
--- a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
+++ b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
@@ -15,7 +15,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
+import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.core.gui.StaticGuiBuilderConfiguration;
 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;
@@ -227,7 +228,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
   private void injectMandatorInformation(
       ImmutableAttributeMap.Builder attributeMap, IEidAuthData eidAuthData) {    
     String natMandatorId = eidAuthData.getGenericData(
-        MsProxyServiceConstants.ATTR_EIDAS_NAT_MANDATOR_PERSONAL_IDENTIFIER, String.class);
+        MsEidasNodeConstants.ATTR_EIDAS_NAT_MANDATOR_PERSONAL_IDENTIFIER, String.class);
     
     if (StringUtils.isNotEmpty(natMandatorId)) {
       log.debug("Injecting natural mandator informations ... ");
@@ -258,7 +259,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
       attributeMap.put(commonName, eidAuthData.getGenericData(
           PvpAttributeDefinitions.MANDATE_LEG_PER_FULL_NAME_NAME, String.class));
       attributeMap.put(legalPersonId, eidAuthData.getGenericData(
-          MsProxyServiceConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER, String.class));
+          MsEidasNodeConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER, String.class));
             
     }            
   }
@@ -275,7 +276,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
         Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH).first();
    
     attributeMap.put(attrDefPersonalId, 
-            eidAuthData.getGenericData(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class));
+            eidAuthData.getGenericData(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class));
     attributeMap.put(attrDefFamilyName, eidAuthData.getFamilyName());
     attributeMap.put(attrDefGivenName, eidAuthData.getGivenName());
     
@@ -308,7 +309,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
   private ImmutableAttributeMap buildAttributesWithoutMandate(IAuthData eidAuthData) {        
     //TODO: throw an error in case of SZR Date with month or day = "00"
     return buildAttributesWithoutMandate(
-        eidAuthData.getGenericData(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class), 
+        eidAuthData.getGenericData(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class), 
         eidAuthData.getFamilyName(), 
         eidAuthData.getGivenName(), 
         eidAuthData.getDateOfBirth());
@@ -366,7 +367,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
   
   private boolean isLegalPersonMandateAvailable(IAuthData authData) {
     return StringUtils.isNoneEmpty(authData.getGenericData(
-          MsProxyServiceConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER, String.class));
+        MsEidasNodeConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER, String.class));
     
   }