refactoring from MOA-ID 3.4.x to MOA E-ID Proxy 4.0.x

4 files changed, 49 insertions, 5 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 4adff7f19..62a19b399 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -154,6 +154,7 @@ public class ConfigurationMigrationUtils {
 			if (MiscUtil.isNotEmpty(target_full)) {
 				if (TargetValidator.isValidTarget(target_full)) {
 					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_PUBLIC_TARGET, target_full);
+					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_PUBLIC_USE_SUB, Boolean.FALSE.toString());
 					
 				} else {
 					String[] target_split = target_full.split("-");
@@ -198,8 +199,13 @@ public class ConfigurationMigrationUtils {
 			//convert selected SZR-GW service
 			if (MiscUtil.isNotEmpty(oa.getSelectedSZRGWServiceURL()))
 				result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL, oa.getSelectedSZRGWServiceURL());
+
+			//convert selected E-ID service
+			if (MiscUtil.isNotEmpty(oa.getSelectedEIDServiceURL()))
+				result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL, oa.getSelectedEIDServiceURL());
+
 			
-	        AuthComponentOA oaauth = oa.getAuthComponentOA();
+			AuthComponentOA oaauth = oa.getAuthComponentOA();
 			if (oaauth != null) {
 				
 				//convert SL20 infos
@@ -815,7 +821,9 @@ public class ConfigurationMigrationUtils {
 	        
 	        
 	        dbOA.setSelectedSZRGWServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL));
-
+	        dbOA.setSelectedEIDServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL));
+	        
+	        
 	        dbOA.setMandateServiceSelectionTemplateURL(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_ELGAMANDATESERVICESELECTION_URL));
 	        dbOA.setSaml2PostBindingTemplateURL(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_SAML2POSTBINDING_URL));
 	        
@@ -1267,6 +1275,9 @@ public class ConfigurationMigrationUtils {
 				result.put(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL, 
 						config.getElgaMandateServiceURLs());
 					
+			if (MiscUtil.isNotEmpty(config.getEidSystemServiceURLs()))
+				result.put(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL, 
+						config.getEidSystemServiceURLs());
 			
 			
 			AuthComponentGeneral auth = config.getAuthComponentGeneral();
@@ -1590,8 +1601,10 @@ public class ConfigurationMigrationUtils {
         
 		MOAIDConfiguration dbconfig = new MOAIDConfiguration();
 		
-		dbconfig.setElgaMandateServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL));
+		dbconfig.setElgaMandateServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL));		
+		dbconfig.setEidSystemServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL));
 		
+			
 		AuthComponentGeneral dbauth = dbconfig.getAuthComponentGeneral();
 		if (dbauth == null) {
 			dbauth = new AuthComponentGeneral();
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
index 1be97c49d..91d738989 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
@@ -52,6 +52,7 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	private static final String TEMPLATES = "templates";	
 	private static final String INTERFEDERATION = "interfederation";
 	private static final String ELGA_MANDATE_SERVICE_URL = "modules.elga_mandate.service.entityID";
+	private static final String EID_SYSTEM_SERVICE_URL = "modules.eid_system.service.entityID";
 	
 	private static final String PROTOCOLS = "protocols";
 	private static final String SAML1 = "saml1";
@@ -195,9 +196,11 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String SERVICE_REVERSION_LOGS_ENABLED = SERVICE_REVERSION + ".log.enabled";
 	public static final String SERVICE_REVERSION_LOGS_EVENTCODES = SERVICE_REVERSION + ".log.eventcodes";
 	
-	public static final String SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL = ELGA_MANDATE_SERVICE_URL;
+	public static final String SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL = ELGA_MANDATE_SERVICE_URL;	
+		
 	public static final String SERVICE_EXTERNAL_MIS_SERVICE_URL = "modules.mis.service.url";
 	public static final String SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL = "modules.szrgw.service.url";
+	public static final String SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL = "modules.eidsystem.service.url";
 	
 	//Namespaces for general MOA-ID config
 	public static final String GENERAL_PUBLICURLPREFIX = PREFIX_MOAID_GENERAL + ".publicURLPrefix";
@@ -235,6 +238,8 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String GENERAL_AUTH_SERVICES_HVB_URL = GENERAL_AUTH + ".services.hvb.url";
 	
 	public static final String GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL = PREFIX_MOAID_GENERAL + "." + ELGA_MANDATE_SERVICE_URL;
+	public static final String GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL = PREFIX_MOAID_GENERAL + "." + EID_SYSTEM_SERVICE_URL;
+	
 	
 	public static final String GENERAL_AUTH_SSO_SERVICENAME = GENERAL_AUTH + "." + SSO + ".servicename";
 	public static final String GENERAL_AUTH_SSO_TARGET = GENERAL_AUTH + "." + SSO + ".target";
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
index c251c7abb..1cb2f3fa0 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
@@ -187,6 +187,10 @@ public class MOAIDConfiguration
     @XmlTransient
     protected String elgaMandateServiceURLs = null;
     
+    @XmlTransient
+    protected String eidSystemServiceURLs = null;
+    
+    
     
     /**
 	 * @return the eventCodes
@@ -503,6 +507,16 @@ public class MOAIDConfiguration
 		this.elgaMandateServiceURLs = elgaMandateServiceURLs;
 	}
 
+	
+	
+	public String getEidSystemServiceURLs() {
+		return eidSystemServiceURLs;
+	}
+
+	public void setEidSystemServiceURLs(String eidSystemServiceURLs) {
+		this.eidSystemServiceURLs = eidSystemServiceURLs;
+	}
+
 	/**
      * Sets the value of the hjid property.
      * 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
index 510fd0581..74a79912e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
@@ -108,6 +108,9 @@ public class OnlineApplication
     
     @XmlTransient
     protected String selectedSZRGWServiceURL = null;
+        
+    @XmlTransient
+    protected String selectedEIDServiceURL = null;
     
     @XmlTransient
     protected String saml2PostBindingTemplateURL = null;
@@ -123,7 +126,7 @@ public class OnlineApplication
 
     @XmlTransient
     protected Boolean iseIDDemoModeActive = false;
-    
+	
     
     public String getForeignbPKTargetList() {
 		return foreignbPKTargetList;
@@ -194,6 +197,15 @@ public class OnlineApplication
 		this.selectedSZRGWServiceURL = selectedSZRGWServiceURL;
 	}
 
+	
+	public String getSelectedEIDServiceURL() {
+		return this.selectedEIDServiceURL;
+	}
+	
+	public void setSelectedEIDServiceURL(String selectedEIDServiceURL) {
+		this.selectedEIDServiceURL = selectedEIDServiceURL;
+	}
+	
 	/**
 	 * @return the isRevisionsLogActive
 	 */