some more updates

3 files changed, 534 insertions, 89 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
new file mode 100644
index 00000000..329c908b
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
@@ -0,0 +1,432 @@
+package at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2;
+
+import static org.junit.Assert.fail;
+
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.joda.time.DateTime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.EIDPostProcessingService;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/SpringTest-context_basic_test.xml")
+public class eIDASAttributePostProcessingTest {
+
+	@Autowired private EIDPostProcessingService postProcessor; 
+	
+	//lower case
+	private static final String P1_eIDASID = "DE/AT/532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
+	private static final String P1_GIVENNAME = "Max";
+	private static final String P1_FAMILYNAME = "Mustermann";
+	private static final DateTime P1_DATEOFBIRTH = DateTime.now();
+	private static final String P1_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P1_BIRTHNAME = "Musterkind";
+	
+	//mixed
+	private static final String P3_eIDASID = "DE/AT/532eaabd9574880dbf76b9b8cc00832c20A6ec113d682299550d7a6e0f345e25";
+	private static final String P3_GIVENNAME = "Max";
+	private static final String P3_FAMILYNAME = "Mustermann";
+	private static final DateTime P3_DATEOFBIRTH = DateTime.now();
+	private static final String P3_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P3_BIRTHNAME = "Musterkind";
+	
+	//upper case
+	private static final String P4_eIDASID = "DE/AT/532EAABD9574880DBF76B9B8CC00832C20A6EC113D682299550D7A6E0F345E25";
+	private static final String P4_GIVENNAME = "Max";
+	private static final String P4_FAMILYNAME = "Mustermann";
+	private static final DateTime P4_DATEOFBIRTH = DateTime.now();
+	private static final String P4_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P4_BIRTHNAME = "Musterkind";
+	
+	//To long identifier
+	private static final String P5_eIDASID = "DE/AT/532EAABD9574880DBF76B9B8CC00832C20A6EC113D682299550D7A6E0F345E251";
+	private static final String P5_GIVENNAME = "Max";
+	private static final String P5_FAMILYNAME = "Mustermann";
+	private static final DateTime P5_DATEOFBIRTH = DateTime.now();
+	private static final String P5_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P5_BIRTHNAME = "Musterkind";
+	
+	//to short identifier
+	private static final String P6_eIDASID = "DE/AT/532EAABD9574880DBF76B9B8CC00832C20A6EC113D682299550D7A6E0F";
+	private static final String P6_GIVENNAME = "Max";
+	private static final String P6_FAMILYNAME = "Mustermann";
+	private static final DateTime P6_DATEOFBIRTH = DateTime.now();
+	private static final String P6_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P6_BIRTHNAME = "Musterkind";
+
+	//no hex encoded identifier
+	private static final String P7_eIDASID = "DE/AT/532EAABD9574880DBF76B9B8CC00832C20A6EC113D682299550D7A6E0F";
+	private static final String P7_GIVENNAME = "Max";
+	private static final String P7_FAMILYNAME = "Mustermann";
+	private static final DateTime P7_DATEOFBIRTH = DateTime.now();
+	private static final String P7_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P7_BIRTHNAME = "Musterkind";
+	
+	
+	private static final String P2_eIDASID = "EE/AT/asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd";
+	private static final String P2_GIVENNAME = "Max";
+	private static final String P2_FAMILYNAME = "Mustermann";
+	private static final DateTime P2_DATEOFBIRTH = DateTime.now();
+	private static final String P2_PLACEOFBIRTH = "Nirgendwo";
+	private static final String P2_BIRTHNAME = "Musterkind";
+	
+	@Test
+	public void dummyTest() { 
+				
+	} 
+		
+	@Test
+	public void DEWithHexLowerCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P1_eIDASID, 
+							P1_FAMILYNAME, 
+							P1_GIVENNAME, 
+							P1_DATEOFBIRTH, 
+							P1_PLACEOFBIRTH, 
+							P1_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"Uy6qvZV0iA2/drm4zACDLCCm7BE9aCKZVQ16bg80XiU=", 
+					P1_FAMILYNAME, 
+					P1_GIVENNAME, 
+					P1_DATEOFBIRTH, 
+					P1_PLACEOFBIRTH, 
+					P1_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+			
+		}		
+	}
+	
+	
+	@Test
+	public void DEWithHexMixedCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P3_eIDASID, 
+							P3_FAMILYNAME, 
+							P3_GIVENNAME, 
+							P3_DATEOFBIRTH, 
+							P3_PLACEOFBIRTH, 
+							P3_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"Uy6qvZV0iA2/drm4zACDLCCm7BE9aCKZVQ16bg80XiU=", 
+					P3_FAMILYNAME, 
+					P3_GIVENNAME, 
+					P3_DATEOFBIRTH, 
+					P3_PLACEOFBIRTH, 
+					P3_BIRTHNAME
+			);
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+			
+		}		
+	}
+	
+	@Test
+	public void DEWithHexUpperCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P4_eIDASID, 
+							P4_FAMILYNAME, 
+							P4_GIVENNAME, 
+							P4_DATEOFBIRTH, 
+							P4_PLACEOFBIRTH, 
+							P4_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"Uy6qvZV0iA2/drm4zACDLCCm7BE9aCKZVQ16bg80XiU=", 
+					P4_FAMILYNAME, 
+					P4_GIVENNAME, 
+					P4_DATEOFBIRTH, 
+					P4_PLACEOFBIRTH, 
+					P4_BIRTHNAME
+			);
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+			
+		}		
+	}
+	
+	@Test
+	public void DEWithHexTooLongCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P5_eIDASID, 
+							P5_FAMILYNAME, 
+							P5_GIVENNAME, 
+							P5_DATEOFBIRTH, 
+							P5_PLACEOFBIRTH, 
+							P5_BIRTHNAME)
+					);
+			
+			
+			
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("Too long input accepted");
+	}
+	
+	@Test
+	public void DEWithHexTooShortCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P6_eIDASID, 
+							P6_FAMILYNAME, 
+							P6_GIVENNAME, 
+							P6_DATEOFBIRTH, 
+							P6_PLACEOFBIRTH, 
+							P6_BIRTHNAME)
+					);
+			
+			
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("Too short input accepted");
+	}
+	
+	@Test
+	public void DEWithNoHexCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P7_eIDASID, 
+							P7_FAMILYNAME, 
+							P7_GIVENNAME, 
+							P7_DATEOFBIRTH, 
+							P7_PLACEOFBIRTH, 
+							P7_BIRTHNAME)
+					);
+			
+			
+		} catch (Exception e) {
+			return;
+			
+		}		
+		
+		fail("Not hex encoded input accepted");
+	}
+	
+	@Test
+	public void EETestCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P2_eIDASID, 
+							P2_FAMILYNAME, 
+							P2_GIVENNAME, 
+							P2_DATEOFBIRTH, 
+							P2_PLACEOFBIRTH, 
+							P2_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd", 
+					P2_FAMILYNAME, 
+					P2_GIVENNAME, 
+					P2_DATEOFBIRTH, 
+					P2_PLACEOFBIRTH, 
+					P2_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+			
+		}		
+	}
+	
+	
+	@Test
+	public void EETestFamilyNameMissingCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P2_eIDASID, 
+							null, 
+							P2_GIVENNAME, 
+							P2_DATEOFBIRTH, 
+							P2_PLACEOFBIRTH, 
+							P2_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd", 
+					P2_FAMILYNAME, 
+					P2_GIVENNAME, 
+					P2_DATEOFBIRTH, 
+					P2_PLACEOFBIRTH, 
+					P2_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("FamilyName missing input accepted");
+		
+	}
+	
+	@Test
+	public void EETestGivenNameMissingCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P2_eIDASID, 
+							P2_FAMILYNAME, 
+							null, 
+							P2_DATEOFBIRTH, 
+							P2_PLACEOFBIRTH, 
+							P2_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd", 
+					P2_FAMILYNAME, 
+					P2_GIVENNAME, 
+					P2_DATEOFBIRTH, 
+					P2_PLACEOFBIRTH, 
+					P2_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("GivenName missing input accepted");
+		
+	}
+	
+	@Test
+	public void EETestDateOfBirthMissingCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							P2_eIDASID, 
+							P2_FAMILYNAME, 
+							P2_GIVENNAME, 
+							null, 
+							P2_PLACEOFBIRTH, 
+							P2_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd", 
+					P2_FAMILYNAME, 
+					P2_GIVENNAME, 
+					P2_DATEOFBIRTH, 
+					P2_PLACEOFBIRTH, 
+					P2_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("DateOfBirth missing input accepted");
+		
+	}
+	
+	@Test
+	public void EETestIDMissingCase() throws Exception {
+		try {
+			ERnBeIDData result = postProcessor.postProcess(
+					generateInputData(
+							null, 
+							P2_FAMILYNAME, 
+							P2_GIVENNAME, 
+							P2_DATEOFBIRTH, 
+							P2_PLACEOFBIRTH, 
+							P2_BIRTHNAME)
+					);
+			
+			validate(result,					
+					"asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd", 
+					P2_FAMILYNAME, 
+					P2_GIVENNAME, 
+					P2_DATEOFBIRTH, 
+					P2_PLACEOFBIRTH, 
+					P2_BIRTHNAME
+			);
+						
+		} catch (Exception e) {
+			return;
+			
+		}
+		
+		fail("eIDAS-Id missing input accepted");
+		
+	}
+	
+	private Map<String, Object> generateInputData(String id, String familyName, String givenName, DateTime dateOfBirth, String placeOfBirth, String birthName) {
+		Map<String, Object> result = new HashMap<String, Object>();		
+		result.put(Constants.eIDAS_ATTR_PERSONALIDENTIFIER, id);		
+		result.put(Constants.eIDAS_ATTR_CURRENTGIVENNAME, givenName);
+		result.put(Constants.eIDAS_ATTR_CURRENTFAMILYNAME, familyName);
+		result.put(Constants.eIDAS_ATTR_DATEOFBIRTH, dateOfBirth);
+		result.put(Constants.eIDAS_ATTR_PLACEOFBIRTH, placeOfBirth);
+		result.put(Constants.eIDAS_ATTR_BIRTHNAME, birthName);				
+		return result;
+			
+	}
+	
+	private void validate(ERnBeIDData result, String id, String familyName, String givenName, DateTime dateOfBirth, String placeOfBirth, String birthName) {
+		if (!result.getPseudonym().equals(id))
+			fail(result.getPseudonym() + "is not equal to " + id);
+		
+		if (!result.getFamilyName().equals(familyName))
+			fail(result.getFamilyName() + "is not equal to " + familyName);
+		
+		if (!result.getGivenName().equals(givenName))
+			fail(result.getGivenName() + "is not equal to " + givenName);
+		
+		if (!result.getDateOfBirth().equals(dateOfBirth))
+			fail(result.getDateOfBirth() + "is not equal to " + dateOfBirth);
+		
+		if (!result.getFormatedDateOfBirth().equals(new SimpleDateFormat("yyyy-MM-dd").format(dateOfBirth.toDate())))
+			fail(result.getDateOfBirth() + "is not equal to " + new SimpleDateFormat("yyyy-MM-dd").format(dateOfBirth.toDate()));
+		
+		if (!result.getPlaceOfBirth().equals(placeOfBirth))
+			fail(result.getPlaceOfBirth() + "is not equal to " + placeOfBirth);
+		
+		if (!result.getBirthName().equals(birthName))
+			fail(result.getBirthName() + "is not equal to " + birthName);
+			
+	}
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASDataStoreTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASDataStoreTest.java
index 16865b33..3233a47b 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASDataStoreTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASDataStoreTest.java
@@ -1,87 +1,87 @@
-package at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2;
-
-import java.security.MessageDigest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.Base64Utils;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SQLiteServiceException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/SpringTest-context_basic_test.xml")
-public class eIDASDataStoreTest {
-
-	@Autowired private eIDASDataStore dataStore; 
-	
-	private static final String P1_TRANSID = "123456789";
-	private static final String P1_eIDASID = "DE/AT/121asdf1as5f1as6f1asd2f1asdf1asdf1asd23f1asdf1asdf4sd7fsdf1asdf1asd2f1asd56f7asdf4asdfasdf1";
-	
-	private static final String P2_TRANSID = "987654321";
-	private static final String P2_eIDASID = "EE/AT/asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd";
-	
-	@Test
-	public void dummyTest() { 
-				
-	} 
-		
-	@Test
-	public void insertTestOne() throws SQLiteServiceException, eIDASAuthenticationException {
-		Trible<String, String, String> eidasId = eIDASResponseUtils.parseEidasPersonalIdentifier(P1_eIDASID);
-		String ernbId = createHashFromUniqueId(eidasId.getThird());
-		dataStore.storeNationalId(
-				P1_TRANSID, 
-				eidasId, 
-				ernbId);	
-		
-		
-		if (StringUtils.isEmpty(dataStore.getEidasRawNationalId(ernbId))
-				&& dataStore.getEidasRawNationalId(ernbId).equals(eidasId.getThird()))
-			throw new SQLiteServiceException("No eIDAS RAW Id in SQLite DB", null);
-		
-		if (StringUtils.isEmpty(dataStore.getErnbNationalId(eidasId))
-				&& dataStore.getErnbNationalId(eidasId).equals(ernbId) )
-			throw new SQLiteServiceException("No ERnB Id in SQLite DB", null);
-		
-	}
-	
-	@Test
-	public void insertTestTwo() throws SQLiteServiceException, eIDASAuthenticationException {
-		Trible<String, String, String> eidasId = eIDASResponseUtils.parseEidasPersonalIdentifier(P2_eIDASID);
-		String ernbId = createHashFromUniqueId(eidasId.getThird());
-		dataStore.storeNationalId(
-				P2_TRANSID, 
-				eidasId, 
-				ernbId);
-		
-		if (StringUtils.isEmpty(dataStore.getEidasRawNationalId(ernbId)) 
-				&& dataStore.getEidasRawNationalId(ernbId).equals(eidasId.getThird()))
-			throw new SQLiteServiceException("No eIDAS RAW Id in SQLite DB", null);
-		
-		if (StringUtils.isEmpty(dataStore.getErnbNationalId(eidasId))
-				&& dataStore.getErnbNationalId(eidasId).equals(ernbId))
-			throw new SQLiteServiceException("No ERnB Id in SQLite DB", null);
-		
-	}
-	
-	private String createHashFromUniqueId(String uniqueId) throws eIDASAuthenticationException {
-		try {
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-            byte[] hash = md.digest(uniqueId.getBytes("UTF-8"));
-            String hashBase64 = new String(Base64Utils.encode(hash), "UTF-8").replaceAll("\r\n", "");
-            return hashBase64;
-            
-        } catch (Exception ex) {
-            throw new eIDASAuthenticationException("internal.03", new Object[]{},  ex);
-            
-        }
-	}
-}
+//package at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2;
+//
+//import java.security.MessageDigest;
+//
+//import org.apache.commons.lang3.StringUtils;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.util.Base64Utils;
+//
+//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SQLiteServiceException;
+//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
+//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore;
+//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
+//import at.gv.egiz.eaaf.core.impl.data.Trible;
+//
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@ContextConfiguration("/SpringTest-context_basic_test.xml")
+//public class eIDASDataStoreTest {
+//
+//	@Autowired private eIDASDataStore dataStore; 
+//	
+//	private static final String P1_TRANSID = "123456789";
+//	private static final String P1_eIDASID = "DE/AT/121asdf1as5f1as6f1asd2f1asdf1asdf1asd23f1asdf1asdf4sd7fsdf1asdf1asd2f1asd56f7asdf4asdfasdf1";
+//	
+//	private static final String P2_TRANSID = "987654321";
+//	private static final String P2_eIDASID = "EE/AT/asfasfasdfasdfasdfasdfasdfasvafasdfasdfasdfasdfasdfasvascasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd";
+//	
+//	@Test
+//	public void dummyTest() { 
+//				
+//	} 
+//		
+//	@Test
+//	public void insertTestOne() throws SQLiteServiceException, eIDASAuthenticationException {
+//		Trible<String, String, String> eidasId = eIDASResponseUtils.parseEidasPersonalIdentifier(P1_eIDASID);
+//		String ernbId = createHashFromUniqueId(eidasId.getThird());
+//		dataStore.storeNationalId(
+//				P1_TRANSID, 
+//				eidasId, 
+//				ernbId);	
+//		
+//		
+//		if (StringUtils.isEmpty(dataStore.getEidasRawNationalId(ernbId))
+//				&& dataStore.getEidasRawNationalId(ernbId).equals(eidasId.getThird()))
+//			throw new SQLiteServiceException("No eIDAS RAW Id in SQLite DB", null);
+//		
+//		if (StringUtils.isEmpty(dataStore.getErnbNationalId(eidasId))
+//				&& dataStore.getErnbNationalId(eidasId).equals(ernbId) )
+//			throw new SQLiteServiceException("No ERnB Id in SQLite DB", null);
+//		
+//	}
+//	
+//	@Test
+//	public void insertTestTwo() throws SQLiteServiceException, eIDASAuthenticationException {
+//		Trible<String, String, String> eidasId = eIDASResponseUtils.parseEidasPersonalIdentifier(P2_eIDASID);
+//		String ernbId = createHashFromUniqueId(eidasId.getThird());
+//		dataStore.storeNationalId(
+//				P2_TRANSID, 
+//				eidasId, 
+//				ernbId);
+//		
+//		if (StringUtils.isEmpty(dataStore.getEidasRawNationalId(ernbId)) 
+//				&& dataStore.getEidasRawNationalId(ernbId).equals(eidasId.getThird()))
+//			throw new SQLiteServiceException("No eIDAS RAW Id in SQLite DB", null);
+//		
+//		if (StringUtils.isEmpty(dataStore.getErnbNationalId(eidasId))
+//				&& dataStore.getErnbNationalId(eidasId).equals(ernbId))
+//			throw new SQLiteServiceException("No ERnB Id in SQLite DB", null);
+//		
+//	}
+//	
+//	private String createHashFromUniqueId(String uniqueId) throws eIDASAuthenticationException {
+//		try {
+//            MessageDigest md = MessageDigest.getInstance("SHA-256");
+//            byte[] hash = md.digest(uniqueId.getBytes("UTF-8"));
+//            String hashBase64 = new String(Base64Utils.encode(hash), "UTF-8").replaceAll("\r\n", "");
+//            return hashBase64;
+//            
+//        } catch (Exception ex) {
+//            throw new eIDASAuthenticationException("internal.03", new Object[]{},  ex);
+//            
+//        }
+//	}
+//}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
index 33454871..7ca42662 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
@@ -12,8 +12,21 @@
 	<bean id="SZRClientForeIDAS"
 		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient" />
  
- 	<bean id="eIDASDataStore"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore" />
+<!--  	<bean id="eIDASDataStore"
+ 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore" /> -->
+ 
+ 	<bean id="EIDPostProcessingService"
+ 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.EIDPostProcessingService" />
+
+	<bean id="DE-PostProcessor" 	
+ 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.DEeIDPostProcessor">
+ 		<property name="priority" value="1" />
+ 	</bean>
+ 			
+ 	<bean id="Default-PostProcessor"
+ 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.GenericeIDPostProcessor">
+ 		<property name="priority" value="0" />
+ 	</bean>
  
  	<bean id="BasicMSSpecificNodeConfig" 
  			class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">