fix(matching): remove prefix from bPK aftern an ID Austria login

2 files changed, 27 insertions, 5 deletions

diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
index b99bd302..cada6f40 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
@@ -197,7 +197,6 @@ public class ZmrClientProductionTest {
 
   }
 
-  @Ignore
   @Test
   public void updateZmrEntryTestIdentity() throws EidasSAuthenticationException {    
     final String personalIdentifier = "7cEYSvKZasdfsafsaf4CDVzNT4E7cjkU4Vq";
@@ -205,9 +204,9 @@ public class ZmrClientProductionTest {
 
     final SimpleEidasData eidasData = SimpleEidasData.builder()
         .citizenCountryCode(cc)
-        .familyName("XXXÖhlinger")
-        .givenName("XXXHildegard")
-        .dateOfBirth("1971-02-18")       
+        .familyName("Muster301")
+        .givenName("Eric")
+        .dateOfBirth("1988-01-03")       
         .personalIdentifier(cc + "/AT/" + personalIdentifier)
         .pseudonym(personalIdentifier)
         .build();
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseTaskTest.java
index 8fae81b1..034f06d1 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseTaskTest.java
@@ -79,7 +79,7 @@ import net.shibboleth.utilities.java.support.xml.ParserPool;
 public class ReceiveMobilePhoneSignatureResponseTaskTest {
 
   private static final String METADATA_PATH = "classpath:/data/idp_metadata_classpath_entity.xml";
-  private static final String BPK_FROM_ID_AUSTRIA = "BF:QVGm48cqcM4UcyhDTNGYmVdrIoY=";
+  private static final String BPK_FROM_ID_AUSTRIA = "QVGm48cqcM4UcyhDTNGYmVdrIoY=";
 
   @Autowired
   protected MsConnectorDummyConfigMap authConfig;
@@ -377,6 +377,29 @@ public class ReceiveMobilePhoneSignatureResponseTaskTest {
     //Mockito.verify(registerSearchService).step7aKittProcess(eq(registerSearchResult), eq(eidData));
   }
 
+  @Test
+  public void httpPostValidSignedAssertionEidValid_ExactlyOneRegisterResultDeprecadedBpkEnc() throws Exception {
+    setupMetadataResolver();
+    initResponse("/data/Response_with_EID_deprecated_bpk_encoding.xml", true);
+    AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
+    SimpleEidasData eidData = createEidasDataMatchingToSamlResponse().build();
+    authProcessData.setGenericDataToSession(Constants.DATA_SIMPLE_EIDAS, eidData);
+    RegisterStatusResults registerSearchResult = buildResultWithOneMatch();
+    MatchingTaskUtils.storeIntermediateMatchingResult(pendingReq, registerSearchResult);
+
+    task.execute(pendingReq, executionContext);
+
+    AuthProcessDataWrapper session = pendingReq.getSessionData(AuthProcessDataWrapper.class);
+    assertEquals("LoA", "http://eidas.europa.eu/LoA/low", session.getQaaLevel());
+    assertEquals("IssueInstant", "2014-03-05T06:39:51Z", session.getIssueInstantString());
+    assertNull("Transition To S16", executionContext.get(Constants.TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK));
+
+    //TODO: update this check because this task selects one result from MDS search result before and creates a new element
+    //Mockito.verify(registerSearchService).step7aKittProcess(eq(registerSearchResult), eq(eidData));
+  }
+  
+  
+  
   //TODO: implement new test that this test makes no sense any more
   @Ignore
   @Test