refactor(eidas): split 'authmodule-eIDAS-v2' into 'common-eidas'

 code and connector-specific elements

8 files changed, 101 insertions, 100 deletions

diff --git a/modules/eidas_proxy-sevice/pom.xml b/modules/eidas_proxy-sevice/pom.xml
index 39763edf..e45d6ee0 100644
--- a/modules/eidas_proxy-sevice/pom.xml
+++ b/modules/eidas_proxy-sevice/pom.xml
@@ -25,12 +25,12 @@
     </dependency>
     <dependency>
       <groupId>at.asitplus.eidas.ms_specific</groupId>
-      <artifactId>core_common_lib</artifactId>
+      <artifactId>core_common_lib</artifactId>      
     </dependency>
     <dependency>
-      <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
-      <artifactId>authmodule-eIDAS-v2</artifactId>
-    </dependency>
+      <groupId>at.asitplus.eidas.ms_specific</groupId>
+      <artifactId>core_commons_eidas</artifactId>
+    </dependency>      
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf-core</artifactId>
@@ -101,11 +101,17 @@
       <type>test-jar</type>
     </dependency>
     <dependency>
+      <groupId>at.asitplus.eidas.ms_specific</groupId>
+      <artifactId>core_commons_eidas</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>        
+    </dependency>    
+    <!-- dependency>
       <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
       <artifactId>authmodule-eIDAS-v2</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
-    </dependency>      
+    </dependency>-->      
     
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
index f6a88aa3..fd6b45bb 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
@@ -1,6 +1,6 @@
 package at.asitplus.eidas.specific.modules.msproxyservice;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 
 /**
@@ -15,22 +15,22 @@ public class MsProxyServiceConstants {
   public static final String TEMPLATE_SP_UNIQUE_ID = "eidasProxyAuth_from_{0}_type_{1}";
   
   // configuration constants
-  public static final String CONIG_PROPS_EIDAS_PROXY_NODE_ENTITYID = Constants.CONIG_PROPS_EIDAS_NODE
+  public static final String CONIG_PROPS_EIDAS_PROXY_NODE_ENTITYID = EidasConstants.CONIG_PROPS_EIDAS_NODE
       + ".proxy.entityId";
-  public static final String CONIG_PROPS_EIDAS_PROXY_NODE_FORWARD_URL = Constants.CONIG_PROPS_EIDAS_NODE
+  public static final String CONIG_PROPS_EIDAS_PROXY_NODE_FORWARD_URL = EidasConstants.CONIG_PROPS_EIDAS_NODE
       + ".proxy.forward.endpoint";
   
   // mandate configuration
   public static final String CONIG_PROPS_EIDAS_PROXY_MANDATES_ENABLED = 
-      Constants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.enabled";  
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.enabled";  
   public static final String CONIG_PROPS_EIDAS_PROXY_MANDATES_PROFILE_DEFAULT_NATURAL = 
-      Constants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.profiles.natural.default";
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.profiles.natural.default";
   public static final String CONIG_PROPS_EIDAS_PROXY_MANDATES_PROFILE_DEFAULT_LEGAL = 
-      Constants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.profiles.legal.default";
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.profiles.legal.default";
   
   
   public static final String CONIG_PROPS_EIDAS_PROXY_WORKAROUND_MANDATES_LEGAL_PERSON = 
-      Constants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.workaround.mandates.legalperson";
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.workaround.mandates.legalperson";
   
   // specific eIDAS-Connector configuration
   public static final String CONIG_PROPS_CONNECTOR_PREFIX = "connector";
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
index e24c753e..cd404cee 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
@@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableSortedSet;
 
 import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.core.config.ServiceProviderConfiguration;
-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.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.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;
@@ -308,8 +308,8 @@ public class EidasProxyServiceController extends AbstractController implements I
       final ServiceProviderConfiguration spConfig = new ServiceProviderConfiguration(connectorConfigMap, authConfig);
 
       // build bPK target from Country-Code 
-      final String ccCountry = authConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE,
-          Constants.DEFAULT_MS_NODE_COUNTRY_CODE);
+      final String ccCountry = authConfig.getBasicConfiguration(EidasConstants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE,
+          EidasConstants.DEFAULT_MS_NODE_COUNTRY_CODE);
       spConfig.setBpkTargetIdentifier(
           EaafConstants.URN_PREFIX_EIDAS + ccCountry + "+" + spCountry);
       
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
index 15524005..92165412 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
@@ -17,8 +17,8 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 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.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.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;
@@ -85,7 +85,7 @@ public class ProxyServiceAuthenticationAction implements IAction {
         lightRespBuilder.relayState(eidasReq.getRelayState());
         
         lightRespBuilder.status(ResponseStatus.builder()
-            .statusCode(Constants.SUCCESS_URI)
+            .statusCode(EidasConstants.SUCCESS_URI)
             .build());
         
         //TODO: check if we can use transient subjectNameIds
@@ -168,8 +168,8 @@ public class ProxyServiceAuthenticationAction implements IAction {
     log.debug("ForwardURL: " + forwardUrl + " selected to forward eIDAS request");
 
     if (basicConfig.getBasicConfiguration(
-        Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD,
-        Constants.FORWARD_METHOD_GET).equals(Constants.FORWARD_METHOD_GET)) {
+        EidasConstants.CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD,
+        EidasConstants.FORWARD_METHOD_GET).equals(EidasConstants.FORWARD_METHOD_GET)) {
 
       log.debug("Use http-redirect for eIDAS node forwarding ...  ");
       // send redirect
@@ -182,14 +182,14 @@ public class ProxyServiceAuthenticationAction implements IAction {
       final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
           basicConfig,
           pendingReq,
-          Constants.TEMPLATE_POST_FORWARD_NAME,
+          EidasConstants.TEMPLATE_POST_FORWARD_NAME,
           null,
           resourceLoader);
 
-      config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_ENDPOINT, forwardUrl);
-      config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_NAME,
+      config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_ENDPOINT, forwardUrl);
+      config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_TOKEN_NAME,
           EidasParameterKeys.TOKEN.toString());
-      config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_VALUE,
+      config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_TOKEN_VALUE,
           tokenBase64);
 
       guiBuilder.build(httpReq, httpResp, config, "Forward to eIDASNode form");
@@ -233,13 +233,13 @@ public class ProxyServiceAuthenticationAction implements IAction {
     if (StringUtils.isNotEmpty(natMandatorId)) {
       log.debug("Injecting natural mandator informations ... ");
       final AttributeDefinition<?> attrDefPersonalId = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+          EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
       final AttributeDefinition<?> attrDefFamilyName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+          EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
       final AttributeDefinition<?> attrDefGivenName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+          EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
       final AttributeDefinition<?> attrDefDateOfBirth = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+          EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
       
       attributeMap.put(attrDefPersonalId, natMandatorId);
       attributeMap.put(attrDefFamilyName, eidAuthData.getGenericData(
@@ -252,9 +252,9 @@ public class ProxyServiceAuthenticationAction implements IAction {
     } else {
       log.debug("Injecting legal mandator informations ... ");
       final AttributeDefinition<?> commonName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_LEGALNAME).first();
+          EidasConstants.eIDAS_ATTR_LEGALNAME).first();
       final AttributeDefinition<?> legalPersonId = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-          Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first();
+          EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first();
       
       attributeMap.put(commonName, eidAuthData.getGenericData(
           PvpAttributeDefinitions.MANDATE_LEG_PER_FULL_NAME_NAME, String.class));
@@ -267,13 +267,13 @@ public class ProxyServiceAuthenticationAction implements IAction {
   private void injectRepesentativeInformation(
       ImmutableAttributeMap.Builder attributeMap, IEidAuthData eidAuthData) {
     final AttributeDefinition<?> attrDefPersonalId = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER).first();
     final AttributeDefinition<?> attrDefFamilyName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME).first();
     final AttributeDefinition<?> attrDefGivenName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME).first();
     final AttributeDefinition<?> attrDefDateOfBirth = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH).first();
    
     attributeMap.put(attrDefPersonalId, 
             eidAuthData.getGenericData(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class));
@@ -319,13 +319,13 @@ public class ProxyServiceAuthenticationAction implements IAction {
   private ImmutableAttributeMap buildAttributesWithoutMandate(String personalIdentifier, String familyName,
       String givenName, String dateOfBirth) {
     final AttributeDefinition<?> attrDefPersonalId = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition<?> attrDefFamilyName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition<?> attrDefGivenName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition<?> attrDefDateOfBirth = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
    
     final ImmutableAttributeMap.Builder attributeMap = 
         ImmutableAttributeMap.builder()
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/utils/EidasProxyServiceUtils.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/utils/EidasProxyServiceUtils.java
index 4cd7ba6c..b8a4c598 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/utils/EidasProxyServiceUtils.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/utils/EidasProxyServiceUtils.java
@@ -1,6 +1,6 @@
 package at.asitplus.eidas.specific.modules.msproxyservice.utils;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import eu.eidas.auth.commons.light.ILightRequest;
 
 /**
@@ -19,7 +19,7 @@ public class EidasProxyServiceUtils {
    */
   public static boolean isLegalPersonRequested(ILightRequest eidasRequest) {
     return eidasRequest.getRequestedAttributes().entrySet().stream()
-        .filter(el -> el.getKey().getFriendlyName().equals(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER))
+        .filter(el -> el.getKey().getFriendlyName().equals(EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER))
         .findFirst()
         .isPresent();
     
@@ -33,7 +33,7 @@ public class EidasProxyServiceUtils {
    */
   public static boolean isNaturalPersonRequested(ILightRequest eidasRequest) {
     return eidasRequest.getRequestedAttributes().entrySet().stream()
-        .filter(el -> el.getKey().getFriendlyName().equals(Constants.eIDAS_ATTR_PERSONALIDENTIFIER))
+        .filter(el -> el.getKey().getFriendlyName().equals(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER))
         .findFirst()
         .isPresent();
     
diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
index 55958d9e..2b652f79 100644
--- a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opensaml.saml.saml2.core.NameIDType;
 import org.opensaml.saml.saml2.core.StatusCode;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -37,10 +36,9 @@ import com.google.common.collect.ImmutableSortedSet;
 
 import at.asitplus.eidas.specific.core.config.ServiceProviderConfiguration;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
-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.auth.eidas.v2.tasks.CreateIdentityLinkTask;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService;
 import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
 import at.asitplus.eidas.specific.modules.msproxyservice.exception.EidasProxyServiceException;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.EidasProxyServiceController;
@@ -59,7 +57,6 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@PrepareForTest(CreateIdentityLinkTask.class)
 @ContextConfiguration(locations = {
     "/spring/SpringTest-context_basic_test.xml",
     "/spring/SpringTest-context_basic_mapConfig.xml",
@@ -222,9 +219,9 @@ public class EidasProxyServiceControllerTest {
         .levelOfAssurance(EaafConstants.EIDAS_LOA_HIGH)
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
             .build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -250,7 +247,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -280,7 +277,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -345,7 +342,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -389,7 +386,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -433,7 +430,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -466,7 +463,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -502,7 +499,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -556,7 +553,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -613,7 +610,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
index 21d2f3b7..97b5bc03 100644
--- a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
@@ -24,7 +24,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opensaml.saml.saml2.core.NameIDType;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -39,9 +38,8 @@ import com.google.common.collect.ImmutableSortedSet;
 import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfiguration;
-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.auth.eidas.v2.tasks.CreateIdentityLinkTask;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServiceAuthenticationAction;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServicePendingRequest;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -64,7 +62,6 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@PrepareForTest(CreateIdentityLinkTask.class)
 @ContextConfiguration(locations = {
     "/spring/SpringTest-context_basic_test.xml",
     "/spring/SpringTest-context_basic_mapConfig.xml",
@@ -163,11 +160,11 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 4, respAttr.size());    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, 
         authData.getDateOfBirth());
         
   }
@@ -199,19 +196,19 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 8, respAttr.size());    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
 
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_NAT_MANDATOR_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_FAMILY_NAME_NAME));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_GIVEN_NAME_NAME));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_BIRTHDATE_NAME));
            
   }
@@ -237,25 +234,25 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 6, respAttr.size());  
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_LEGALNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_LEGALNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_LEG_PER_FULL_NAME_NAME));
     
     assertNull("find nat. person subject: personalId", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER));
     assertNull("find nat. person subject: familyName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME));
     assertNull("find nat. person subject: givenName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME));
     assertNull("find nat. person subject: dateOfBirth", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH));
     
   }
   
@@ -267,7 +264,7 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder().put(
-        attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+        attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
     
     
@@ -307,8 +304,8 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder()
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
         .build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
         
@@ -331,11 +328,11 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 10, respAttr.size());  
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, authData.getDateOfBirth());
    
   }
   
@@ -347,7 +344,8 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder()
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
+            EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
         .build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
         
@@ -371,13 +369,13 @@ public class ProxyServiceAuthenticationActionTest {
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 6, respAttr.size());     
     assertNull("find nat. person subject: personalId", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER));
     assertNull("find nat. person subject: familyName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME));
     assertNull("find nat. person subject: givenName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME));
     assertNull("find nat. person subject: dateOfBirth", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH));
     
   }
   
diff --git a/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml b/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
index 9870d22a..08b25f0f 100644
--- a/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
+++ b/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
@@ -14,7 +14,7 @@
   <import resource="classpath:/spring/eidas_proxy-service.beans.xml"/>
 
   <bean id="springManagedSpecificProxyserviceCommunicationService"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
+        class="at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService" />
 
  <bean id="mvcGUIBuilderImpl"
     class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
@@ -32,7 +32,7 @@
   </bean>
 
   <bean id="attributeRegistry"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
+    class="at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry">
     <property name="eidasAttributesFile"
       ref="specificConnectorAttributesFileWithPath" />
     <property name="additionalAttributesFile"