Merge branch 'nightlybuild' into feature/ms_proxy_service

# Conflicts:
#	ms_specific_proxyservice/src/test/resources/config/logback_config.xml

22 files changed, 96 insertions, 95 deletions

diff --git a/README.md b/README.md
index 5eabd899..4307efaa 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,12 @@ The full release package will be located add
 
 ## Changelog
 
+**v1.3.2**
+
+- Bugfix
+  - Fehlerhafter Prozessstatus bei GUI basierten Matching behoben, welche die Neueintragung ins ERnP verhindert
+  - Fehlender Parameter bei GUI basierten Matching behoben, welcher zu falschen Statistiklogger Einträgen führt
+
 **v1.3.1**
 
 - Optimierung und Fehlerkorrektur bei UX basierten Matching-Schritten
diff --git a/basicConfig/ms-connector/templates/other_login_method.html b/basicConfig/ms-connector/templates/other_login_method.html
index d392a553..30bae604 100644
--- a/basicConfig/ms-connector/templates/other_login_method.html
+++ b/basicConfig/ms-connector/templates/other_login_method.html
@@ -66,7 +66,7 @@
       <div  id="insertErnp" class="block">
         <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
             <button type="submit" role="button" value="Keine weitere HS / eIDAS"
-                  th:text="#{gui.otherlogin.button.inserternp}">D
+                  th:text="#{gui.otherlogin.button.inserternp}">
             </button>
             <input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
@@ -77,7 +77,7 @@
         <!-- Abbrechen Button -->
         <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
             <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
-            <input type="hidden" name="stopAuthProcess" value="true">
+            <input type="hidden" name="loginSelection" value="STOP_MATCHING_PROCESS">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
         </form>
       </div>
diff --git a/build_reporting/pom.xml b/build_reporting/pom.xml
index 06f59ed7..3427e831 100644
--- a/build_reporting/pom.xml
+++ b/build_reporting/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>at.asitplus.eidas</groupId>
     <artifactId>ms_specific</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>build_reporting</artifactId>
   <packaging>pom</packaging>
diff --git a/infos/handbook/Dokumentation eIDAS-Personen-Matching v1.0.pdf b/infos/handbook/Dokumentation eIDAS-Personen-Matching v1.0.pdf
new file mode 100644
index 00000000..67f24b2a
--- /dev/null
+++ b/infos/handbook/Dokumentation eIDAS-Personen-Matching v1.0.pdf
diff --git a/infos/ms-connector/history.txt b/infos/ms-connector/history.txt
index 5dbe4d56..909aeabb 100644
--- a/infos/ms-connector/history.txt
+++ b/infos/ms-connector/history.txt
@@ -1,5 +1,10 @@
 Dieses Dokument zeigt die Veränderungen und Erweiterungen am eIDAS MS-Connector
 
+Version 1.3.2 (2022-08-02):    
+- Bugfix
+    - Fehlerhafter Prozessstatus bei GUI basierten Matching behoben, welche die Neueintragung ins ERnP verhindert
+    - Fehlender Parameter bei GUI basierten Matching behoben, welcher zu falschen Statistiklogger Einträgen führt
+
 Version 1.3.1 (2022-07-05):    
   - Optimierung und Fehlerkorrektur für UX basierten Matching-Schritten
   - Konfigurierbare Maximalanzahl von Ergebnissen bei Adresssuche
diff --git a/infos/readme_1.3.2.md b/infos/readme_1.3.2.md
new file mode 100644
index 00000000..b290f4fe
--- /dev/null
+++ b/infos/readme_1.3.2.md
@@ -0,0 +1,28 @@
+# MS-Connector v1.3.2 Release vom 02.08.2022
+
+Der MS-Connector implementiert eine Bridge zwischen dem österreichischen E-ID System und dem eIDAS Framework um ausländischen Benutzern eine Anmeldung am österreichischen Service-Providern zu ermöglichen.
+
+### Änderungen in dieser Version
+
+  - Bugfix
+      - Fehlerhafter Prozessstatus bei GUI basierten Matching behoben, welche die Neueintragung ins ERnP verhindert
+      - Fehlender Parameter bei GUI basierten Matching behoben, welcher zu falschen Statistiklogger Einträgen führt
+
+
+### Durchführen eines Updates 
+
+Nachfolgend finden Sie die erforderlichen Schritte für das Update eines bestehenden MS-specific eIDAS Connectors auf die aktuelle Version 1.3.2. Das vollständige Handbuch mit allen Konfigurationsparametern finden Sie im Releasepackage im Verzeichnis: _infos/handbook/_
+
+### Ausgehend von einer bestehenden Version 1.3.1 
+
+1. Stoppen Sie die *MS-Connector* Applikation und fertigen Sie eine Sicherungskopie Ihrer Applikation inklusive Konfiguration an
+
+2. Entpacken Sie das Releasepacket *ms_specific_connector-1.3.2-dist.zip* in ein temporäres Verzeichnis welches in weiterer Folge __MsConnectorPackage__ bezeichnet wird.
+
+3. Kopieren sie die Applikation __MsConnectorPackage__/ms_connector.war nach in das Applikationsverzeichnis ihres Applikationsservers
+
+4. Update bestehender Dateien . Die nachfolgenden Dateien wurden geändert und erfordern eine Anpassung oder eine Übernahme dem Releasepacket, sofern die Anpassung nicht bereits durchgeführt wurde
+
+   * Vollständige Übernahme: __MsConnectorPackage__/config/templates/other_login_method.html
+   
+
diff --git a/modules/authmodule-eIDAS-v2/pom.xml b/modules/authmodule-eIDAS-v2/pom.xml
index 9c1e5113..1ac03fbb 100644
--- a/modules/authmodule-eIDAS-v2/pom.xml
+++ b/modules/authmodule-eIDAS-v2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
   <artifactId>authmodule-eIDAS-v2</artifactId>
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
index 8c294c97..c9c3a2fa 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
@@ -59,9 +59,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.AbstractSoapClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.AbstractSoapClient.HttpClientConfig.HttpClientConfigBuilder;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
-import at.gv.e_government.reference.namespace.persondata._20020228.AlternativeNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.IdentificationType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
@@ -84,7 +82,6 @@ import szrservices.SZRException_Exception;
 import szrservices.SignContent;
 import szrservices.SignContentEntry;
 import szrservices.SignContentResponseType;
-import szrservices.TravelDocumentType;
 
 
 @Slf4j
@@ -139,17 +136,17 @@ public class SzrClient extends AbstractSoapClient {
    * Get bPK of person.
    *
    *
-   * @param eidData    Minimum dataset of person
+   * @param matchedPersonData    Minimum dataset of person
    * @param target     requested bPK target
    * @param vkz        Verfahrenskennzeichen
    * @return bPK for this person
    * @throws SzrCommunicationException In case of a SZR error
    */
-  public List<String> getBpk(SimpleEidasData eidData, String target, String vkz)
+  public List<String> getBpk(MatchedPersonResult matchedPersonData, String target, String vkz)
       throws SzrCommunicationException {
     try {
       final GetBPK parameters = new GetBPK();
-      parameters.setPersonInfo(generateSzrRequest(eidData));
+      parameters.setPersonInfo(generateSzrRequest(matchedPersonData));
       parameters.getBereichsKennung().add(target);
       parameters.setVKZ(vkz);
       final GetBPKResponse result = this.szr.getBPK(parameters);
@@ -201,13 +198,13 @@ public class SzrClient extends AbstractSoapClient {
    * @throws SzrCommunicationException In case of a SZR error
    */
   public String getEidasBind(final String vsz, final String bindingPubKey, final String eidStatus,
-                             SimpleEidasData eidData)throws SzrCommunicationException {
+      MatchedPersonResult eidData)throws SzrCommunicationException {
 
     final Map<String, Object> eidsaBindMap = new HashMap<>();
     eidsaBindMap.put(ATTR_NAME_VSZ, vsz);
     eidsaBindMap.put(ATTR_NAME_STATUS, eidStatus);
     eidsaBindMap.put(ATTR_NAME_PUBKEYS, Collections.singletonList(bindingPubKey));
-    eidsaBindMap.put(PvpAttributeDefinitions.EID_ISSUING_NATION_NAME, eidData.getCitizenCountryCode());
+    eidsaBindMap.put(PvpAttributeDefinitions.EID_ISSUING_NATION_NAME, eidData.getCountryCode());
     injectMdsIfAvailableAndActive(eidsaBindMap, eidData);
 
     try {
@@ -264,59 +261,6 @@ public class SzrClient extends AbstractSoapClient {
     return personInfo;
   }
   
-  private PersonInfoType generateSzrRequest(SimpleEidasData eidData) {
-    log.trace("Starting connecting SZR Gateway");
-    final PersonInfoType personInfo = new PersonInfoType();
-    final PersonNameType personName = new PersonNameType();
-    final PhysicalPersonType naturalPerson = new PhysicalPersonType();
-    final TravelDocumentType eDocument = new TravelDocumentType();
-
-    naturalPerson.setName(personName);
-    personInfo.setPerson(naturalPerson);
-    personInfo.setTravelDocument(eDocument);
-
-    // person information
-    personName.setFamilyName(eidData.getFamilyName());
-    personName.setGivenName(eidData.getGivenName());
-    naturalPerson.setDateOfBirth(eidData.getDateOfBirth());
-    
-    //TODO: need to be updated to new eIDAS document interface!!!!
-    eDocument.setIssuingCountry(eidData.getCitizenCountryCode());
-    eDocument.setDocumentNumber(eidData.getPseudonym());
-
-    // eID document information
-    String documentType = basicConfig
-        .getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE,
-                               Constants.SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE);
-    eDocument.setDocumentType(documentType);
-
-    // set PlaceOfBirth if available
-    if (eidData.getPlaceOfBirth() != null) {
-      log.trace("Find 'PlaceOfBirth' attribute: " + eidData.getPlaceOfBirth());
-      boolean setPlaceOfBirth = basicConfig
-          .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE, true);
-      if (setPlaceOfBirth) {
-        naturalPerson.setPlaceOfBirth(eidData.getPlaceOfBirth());
-        log.trace("Adding 'PlaceOfBirth' to ERnB request ... ");
-      }
-    }
-
-    // set BirthName if available
-    if (eidData.getBirthName() != null) {
-      log.trace("Find 'BirthName' attribute: " + eidData.getBirthName());
-      boolean setBirthName = basicConfig
-          .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE, true);
-      if (setBirthName) {
-        final AlternativeNameType alternativeName = new AlternativeNameType();
-        naturalPerson.setAlternativeName(alternativeName);
-        alternativeName.setFamilyName(eidData.getBirthName());
-        log.trace("Adding 'BirthName' to ERnB request ... ");
-      }
-    }
-
-    return personInfo;
-  }
-
   private IdentityLinkType getIdentityLinkGeneric(GetIdentityLinkEidas getIdl) throws Exception {
     final JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
     final Marshaller jaxbMarshaller = jaxbContext.createMarshaller();
@@ -450,7 +394,7 @@ public class SzrClient extends AbstractSoapClient {
     log.info("SZR-Client initialization successfull");
   }
 
-  private void injectMdsIfAvailableAndActive(Map<String, Object> eidsaBindMap, SimpleEidasData eidData) {
+  private void injectMdsIfAvailableAndActive(Map<String, Object> eidsaBindMap, MatchedPersonResult eidData) {
     if (basicConfig.getBasicConfigurationBoolean(
         Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SET_MDS_TO_EIDASBIND, false)) {
       log.info("Injecting MDS into eidasBind ... ");
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
index e8b7b2c1..2379f39e 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -156,7 +156,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 
   private void executeIdlMode(SimpleEidasData eidData, MatchedPersonResult matchedPersonData) throws EaafException {
     //request SZR
-    SzrResultHolder idlResult = requestSzrForIdentityLink(eidData, matchedPersonData);
+    SzrResultHolder idlResult = requestSzrForIdentityLink(matchedPersonData);
 
     //write revision-Log entry for personal-identifier mapping
     writeExtendedRevisionLogEntry(eidData, eidData.getPersonalIdentifier());
@@ -188,7 +188,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 
     // get eIDAS bind
     String signedEidasBind = szrClient
-        .getEidasBind(vsz, authBlockSigner.getBase64EncodedPublicKey(), EID_STATUS, eidData);
+        .getEidasBind(vsz, authBlockSigner.getBase64EncodedPublicKey(), EID_STATUS, matchedPersonData);
     revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.SZR_EIDASBIND_RECEIVED);
     AuthProcessDataWrapper authProcessDataWrapper = MatchingTaskUtils.getAuthProcessDataWrapper(pendingReq);
     authProcessDataWrapper.setGenericDataToSession(MsEidasNodeConstants.AUTH_DATA_EIDAS_BIND, signedEidasBind);
@@ -213,8 +213,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
     }
   }
 
-  private SzrResultHolder requestSzrForIdentityLink(SimpleEidasData eidData,
-      MatchedPersonResult matchedPersonData) throws EaafException {
+  private SzrResultHolder requestSzrForIdentityLink(MatchedPersonResult matchedPersonData) throws EaafException {
     //request IdentityLink from SZR
     log.debug("Requesting encrypted baseId by already matched person information ... ");
     IdentityLinkType result = szrClient.getIdentityLinkInRawMode(matchedPersonData);
@@ -230,7 +229,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
     if (debugUseSzrForBpk) {
       String vkz = basicConfig
           .getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ, "no VKZ defined");
-      List<String> bpkList = szrClient.getBpk(eidData, targetId, vkz);
+      List<String> bpkList = szrClient.getBpk(matchedPersonData, targetId, vkz);
       if (!bpkList.isEmpty()) {
         bpk = bpkList.get(0);
       }
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
index 03414f9e..ec858116 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
@@ -143,6 +143,7 @@ public class ReceiveOtherLoginMethodGuiResponseTask extends AbstractLocaleAuthSe
         
       case ADD_ME_AS_NEW:
         executionContext.put(Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK, true);
+        executionContext.put(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK, false);
         return;
 
       default:
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
index d2bfe662..ecffaa19 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
@@ -45,7 +45,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr.SzrClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -127,13 +126,13 @@ public class SzrClientProductionTest {
 
   }
 
-  private SimpleEidasData getEidData() {
-    return SimpleEidasData.builder()
+  private MatchedPersonResult getEidData() {
+    return MatchedPersonResult.builder()
         .familyName("Mustermann")
         .givenName("Franz")
         .dateOfBirth("1989-05-04")
-        .citizenCountryCode("IS")
-        .pseudonym("1234ffgsdfg56789ABCDEF")
+        .bpk("1234ffgsdfg56789ABCDEF")
+        .countryCode("XX")
         .build();
   }
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
index e61532a3..a35f9bad 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
@@ -58,7 +58,7 @@ import com.github.skjolber.mockito.soap.SoapServiceRule;
 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.clients.szr.SzrClient;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -270,15 +270,15 @@ public class SzrClientTest {
 
   }
 
-  private SimpleEidasData getEidData() {
-    return SimpleEidasData.builder()
+  private MatchedPersonResult getEidData() {
+    return MatchedPersonResult.builder()
         .familyName("Mustermann")
         .givenName("Franz")
         .dateOfBirth("1989-05-05")
-        .citizenCountryCode("IS")
-        .pseudonym("1234sdgsdfg56789ABCDEF")
+        .bpk("1234sdgsdfg56789ABCDEF")
+        .countryCode("IS")
         .build();
   }
-
+  
 
 }
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
index 66867fce..dfbb0266 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
@@ -126,16 +126,35 @@ httpReq.setParameter(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER,  SelectedLog
   
   @Test
   public void withAddMeAsNewSelection() throws TaskExecutionException {
-    testTransition(SelectedLoginMethod.ADD_ME_AS_NEW, Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK);
-    assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
+    testTransition(SelectedLoginMethod.ADD_ME_AS_NEW, Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK);    
+    
+    assertEquals("return to selection", false, 
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
+    assertEquals("return to selection", false, 
+        executionContext.get(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK));    
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_EIDAS_LOGIN));        
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK));
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_MOBILE_PHONE_SIGNATURE_REQUEST_TASK));
     
   }
-
+        
   @Test
   public void withRequestingNewEntrySelection() throws TaskExecutionException {
     testTransition(SelectedLoginMethod.REQUESTING_NEW_ENTRY, Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK);
+    
     assertEquals("return to selection", true, executionContext.get(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK));
-    assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
+    assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));        
+    assertNull("return to selection", 
+        executionContext.get(Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK));
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_EIDAS_LOGIN));        
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK));
+    assertNull("return to selection",  
+        executionContext.get(Constants.TRANSITION_TO_GENERATE_MOBILE_PHONE_SIGNATURE_REQUEST_TASK));
     
   }
   
diff --git a/modules/authmodule_id-austria/pom.xml b/modules/authmodule_id-austria/pom.xml
index 9a77c787..e7ade26b 100644
--- a/modules/authmodule_id-austria/pom.xml
+++ b/modules/authmodule_id-austria/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
   <artifactId>authmodule_id-austria</artifactId>
diff --git a/modules/core_common_lib/pom.xml b/modules/core_common_lib/pom.xml
index f3378b17..1a33b352 100644
--- a/modules/core_common_lib/pom.xml
+++ b/modules/core_common_lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>core_common_lib</artifactId>
   <name>ms_specific_common_lib</name>
diff --git a/modules/core_common_webapp/pom.xml b/modules/core_common_webapp/pom.xml
index 5f61003f..2c6c4b5c 100644
--- a/modules/core_common_webapp/pom.xml
+++ b/modules/core_common_webapp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>core_common_webapp</artifactId>
   <name>WebApplication commons</name>
diff --git a/modules/core_commons_eidas/pom.xml b/modules/core_commons_eidas/pom.xml
index 2b2503d8..56ee1555 100644
--- a/modules/core_commons_eidas/pom.xml
+++ b/modules/core_commons_eidas/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>core_commons_eidas</artifactId>
   <name>Commons for eIDAS Node communication</name>
diff --git a/modules/eidas_proxy-sevice/pom.xml b/modules/eidas_proxy-sevice/pom.xml
index f2b6f840..d8ab9dee 100644
--- a/modules/eidas_proxy-sevice/pom.xml
+++ b/modules/eidas_proxy-sevice/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
   <artifactId>eidas_proxy-sevice</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index baec271d..6d6d2ca2 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
     <groupId>at.asitplus.eidas</groupId>
 	  <artifactId>ms_specific</artifactId>
-	  <version>1.3.2-SNAPSHOT</version>
+	  <version>1.3.3-SNAPSHOT</version>
 	</parent>
 	<groupId>at.asitplus.eidas.ms_specific</groupId>
 	<artifactId>modules</artifactId>
diff --git a/ms_specific_connector/pom.xml b/ms_specific_connector/pom.xml
index c888c586..40c09731 100644
--- a/ms_specific_connector/pom.xml
+++ b/ms_specific_connector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>at.asitplus.eidas</groupId>
     <artifactId>ms_specific</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <groupId>at.asitplus.eidas.ms_specific</groupId>
diff --git a/ms_specific_proxyservice/pom.xml b/ms_specific_proxyservice/pom.xml
index ef347bae..f0266984 100644
--- a/ms_specific_proxyservice/pom.xml
+++ b/ms_specific_proxyservice/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>at.asitplus.eidas</groupId>
     <artifactId>ms_specific</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>  
   <groupId>at.asitplus.eidas.ms_specific</groupId>
   <artifactId>ms_specific_proxyservice</artifactId>
diff --git a/pom.xml b/pom.xml
index 303303a0..946dd3ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.asitplus.eidas</groupId>
   <artifactId>ms_specific</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>MS specific eIDAS components</name>