Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2

1 files changed, 17 insertions, 7 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index f515ea6bd..7ecd7dde8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -58,11 +58,13 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OAuth;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineMandates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Organization;
 import at.gv.egovernment.moa.id.commons.db.dao.config.PVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Protocols;
+import at.gv.egovernment.moa.id.commons.db.dao.config.SAML1;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SSO;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SecurityLayer;
@@ -141,11 +143,7 @@ public class BuildFromLegacyConfig {
 	    	//Load generic Config
 	    	Map<String, String> genericConfiguration = builder.buildGenericConfiguration();
 	    	GeneralConfiguration authGeneral = new GeneralConfiguration();
-	    	
-	    	if (genericConfiguration.containsKey(GENERIC_CONFIG_PARAM_SOURCEID))
-	    		authGeneral.setAlternativeSourceID(
-	    				(String)genericConfiguration.get(GENERIC_CONFIG_PARAM_SOURCEID));
-	    	
+	    		    	
 	    	if (genericConfiguration.containsKey(ConfigurationProvider.TRUST_MANAGER_REVOCATION_CHECKING))
 	    		authGeneral.setTrustManagerRevocationChecking(
 	    				Boolean.valueOf((String)genericConfiguration.get(ConfigurationProvider.TRUST_MANAGER_REVOCATION_CHECKING)));
@@ -179,6 +177,19 @@ public class BuildFromLegacyConfig {
 	    	final List<String> PROTOCOLS_LEGACY_ALLOWED = Arrays.asList("id_saml1","id_pvp2x");
 	    	prot_legacy.setProtocolName(PROTOCOLS_LEGACY_ALLOWED);
 	    	
+	    	//set SAML1 config
+	    	SAML1 saml1 = new SAML1();
+	    	saml1.setIsActive(true);
+	    	if (genericConfiguration.containsKey(GENERIC_CONFIG_PARAM_SOURCEID))
+	    		saml1.setSourceID((String)genericConfiguration.get(GENERIC_CONFIG_PARAM_SOURCEID));
+	    	auth_protocols.setSAML1(saml1);
+	    	
+	    	//set OAuth config
+	    	OAuth oauth = new OAuth();
+	    	oauth.setIsActive(true);
+	    	auth_protocols.setOAuth(oauth);
+	    	
+	    	//set PVP2.1 config
 	    	PVP2 prot_pvp2 = new PVP2();
 	    	auth_protocols.setPVP2(prot_pvp2);
 	    	prot_pvp2.setPublicURLPrefix("https://....");
@@ -188,7 +199,7 @@ public class BuildFromLegacyConfig {
 	    	prot_pvp2.setOrganization(pvp2_org);
 	    	pvp2_org.setDisplayName("OrganisationDisplayName");
 	    	pvp2_org.setName("OrganisatioName");
-	    	pvp2_org.setURL("http://www.egiz.gv.at");
+	    	pvp2_org.setURL("http://testorganisation.at");
 	    	
 	    	List<Contact> pvp2_contacts = new ArrayList<Contact>();
 	    	prot_pvp2.setContact(pvp2_contacts);	    	
@@ -357,7 +368,6 @@ public class BuildFromLegacyConfig {
 //	        	oa_auth.setUseIFrame(false);
 //	        	oa_auth.setUseUTC(oa.getUseUTC());
 	        	
-	        	
 	        	//BKUURLs
 	        	BKUURLS bkuurls = new BKUURLS();
 	        	bkuurls.setOnlineBKU(oldbkuonline);