Merge branch 'feature/matching_base' into nightlybuild_matching

# Conflicts:
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java

1 files changed, 20 insertions, 9 deletions

diff --git a/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/MsEidasNodeConstants.java b/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/MsEidasNodeConstants.java
index 8580950f..be5d7c7d 100644
--- a/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/MsEidasNodeConstants.java
+++ b/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/MsEidasNodeConstants.java
@@ -51,7 +51,13 @@ public class MsEidasNodeConstants {
   public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH = "webcontent.templates";
 
   public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_CCSELECTION = "webcontent.templates.countryselection";
-  
+  public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_OTHER_LOGIN_METHOD_SELECTION = "webcontent.templates"
+      + ".otherLoginMethodselection";
+  public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_RESIDENCY = "webcontent.templates"
+      + ".residency";
+  public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_OTHER_CONTACTS_WITH_AUSTRIAN_EGOV =
+      "webcontent.templates.otherContactsWithAustrianEgov";
+
   public static final String PROP_CONFIG_MONITORING_EIDASNODE_METADATAURL =
       "monitoring.eIDASNode.metadata.url";
 
@@ -84,7 +90,7 @@ public class MsEidasNodeConstants {
       PROP_CONFIG_PVP2_PREFIX + "metadata.organisation.friendyname";
   public static final String CONFIG_PROPS_METADATA_ORGANISATION_URL =
       PROP_CONFIG_PVP2_PREFIX + "metadata.organisation.url";
-  
+
   // TODO: is not implemented yet
   public static final String PROP_CONFIG_SP_VALIDATION_DISABLED =
       "configuration.sp.disableRegistrationRequirement";
@@ -99,14 +105,14 @@ public class MsEidasNodeConstants {
   public static final String PROP_CONFIG_AUTHBLOCK_KEYSTORE_PASSWORD =
       "auth.eIDAS.authblock.keystore.password";
   public static final String PROP_CONFIG_AUTHBLOCK_KEYSTORE_NAME =
-      "auth.eIDAS.authblock.keystore.name";  
+      "auth.eIDAS.authblock.keystore.name";
   public static final String PROP_CONFIG_AUTHBLOCK_KEY_ALIAS =
       "auth.eIDAS.authblock.key.alias";
   public static final String PROP_CONFIG_AUTHBLOCK_KEY_PASSWORD =
       "auth.eIDAS.authblock.key.password";
-  
-  
-  
+
+
+
 
   public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp";
   public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER;
@@ -144,7 +150,10 @@ public class MsEidasNodeConstants {
   public static final String ENDPOINT_PVP_REDIRECT = "/pvp/redirect";
 
   public static final String ENDPOINT_COUNTRYSELECTION = "/myHomeCountry";
-
+  public static final String ENDPOINT_OTHER_LOGIN_METHOD_SELECTION = "/otherLoginMethod";
+  public static final String ENDPOINT_RESIDENCY_INPUT = "/residency";
+  public static final String ENDPOINT_RESIDENCY_SEARCH = "/residency/search";
+  public static final String ENDPOINT_OTHER_CONTACTS_INPUT = "/otherContacts";
   public static final String ENDPOINT_MONITORING_MONITOR = "/monitoring";
   public static final String ENDPOINT_MONITORING_VERIFY = "/verify";
 
@@ -155,7 +164,9 @@ public class MsEidasNodeConstants {
   public static final String TEMPLATE_HTML_ERROR = "error_message.html";
   public static final String TEMPLATE_HTML_PVP_POSTBINDING = "pvp2_post_binding.html";
   public static final String TEMPLATE_HTML_COUNTRYSELECTION = "countrySelection.html";
-
+  public static final String TEMPLATE_HTML_OTHERLOGINMETHODS = "other_login_method.html";
+  public static final String TEMPLATE_HTML_RESIDENCY = "residency.html";
+  public static final String TEMPLATE_HTML_OTHERCONTACTSWITHAUSTRIANEGOV = "otherContactsWithAustrianEgov.html";
   // ************ execution context and generic data ************
   public static final String REQ_PARAM_SELECTED_COUNTRY = "selectedCountry";
   public static final String REQ_PARAM_SELECTED_ENVIRONMENT = "selectedEnvironment";
@@ -227,5 +238,5 @@ public class MsEidasNodeConstants {
   private MsEidasNodeConstants() {
     //hidden Constructor for class with static values only.
   }
-  
+
 }