1 files changed, 51 insertions, 12 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
index e896bb80b..b3db074a2 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
@@ -66,9 +66,11 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	private List<String> misServicesList = new ArrayList<String>();
 	private List<String> elgaServicesList = new ArrayList<String>();
 	private List<String> szrgwServicesList = new ArrayList<String>();
+	private List<String> eidServicesList = new ArrayList<String>();
 	private String misServiceSelected = null;
 	private String elgaServiceSelected = null;	
 	private String szrgwServiceSelected = null;
+	private String eidServiceSelected = null;
 	
 	private boolean calculateHPI = false;
 	
@@ -90,10 +92,20 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	private boolean sl20Active = false;
 	private String sl20EndPoints = null;
 	
+	private boolean isMoaidMode = false;
+	
 	/**
+	 * @param isMoaidMode 
 	 * 
 	 */
 	public OAAuthenticationData() {
+		try {
+			this.isMoaidMode = ConfigurationProvider.getInstance().isMOAIDMode();
+		} catch (ConfigurationException e) {
+			e.printStackTrace();
+			
+		}
+		
 		 keyBoxIdentifierList = new HashMap<String, String>();
 		 MOAKeyBoxSelector[] values = MOAKeyBoxSelector.values();
 		 for (int i=0; i<values.length; i++) {
@@ -105,18 +117,27 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 		 
 		 try {				
 			 MOAIDConfiguration dbconfig = ConfigurationProvider.getInstance().getDbRead().getMOAIDConfiguration();
-				 			 
-			 try {
-				 elgaServicesList = KeyValueUtils.getListOfCSVValues(dbconfig.getElgaMandateServiceURLs());
-				 misServicesList = KeyValueUtils.getListOfCSVValues(
-						 dbconfig.getAuthComponentGeneral().getOnlineMandates().getConnectionParameter().getURL());
-			 } catch (NullPointerException e) {}
-								
+				
+			 if (this.isMoaidMode) {
+				 try {
+					 elgaServicesList = KeyValueUtils.getListOfCSVValues(dbconfig.getElgaMandateServiceURLs());
+					 misServicesList = KeyValueUtils.getListOfCSVValues(
+							 dbconfig.getAuthComponentGeneral().getOnlineMandates().getConnectionParameter().getURL());
+				 } catch (NullPointerException e) {}
+									
+				 try {
+					 szrgwServicesList = KeyValueUtils.getListOfCSVValues(
+							 dbconfig.getAuthComponentGeneral().getForeignIdentities().getConnectionParameter().getURL());
+				 } catch (NullPointerException e) {}
+				 
+			 }
+			 
+			 
 			 try {
-				 szrgwServicesList = KeyValueUtils.getListOfCSVValues(
-						 dbconfig.getAuthComponentGeneral().getForeignIdentities().getConnectionParameter().getURL());
+				 eidServicesList = KeyValueUtils.getListOfCSVValues(dbconfig.getEidSystemServiceURLs());
 			 } catch (NullPointerException e) {}
 			 
+			 
 		} catch (ConfigurationException e) {
 			log.error("MOA-ID-Configuration initialization FAILED.", e);
 				
@@ -151,7 +172,8 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	public List<String> parse(OnlineApplication dbOA, AuthenticatedUser authUser, HttpServletRequest request) {
 		keyBoxIdentifier = dbOA.getKeyBoxIdentifier().value();
 		
-		szrgwServiceSelected = dbOA.getSelectedSZRGWServiceURL();
+		szrgwServiceSelected = dbOA.getSelectedSZRGWServiceURL();		
+		eidServiceSelected = dbOA.getSelectedEIDServiceURL();
 		
         AuthComponentOA oaauth = dbOA.getAuthComponentOA();
 		if (oaauth != null) {
@@ -302,6 +324,10 @@ public class OAAuthenticationData implements IOnlineApplicationData {
         if (MiscUtil.isNotEmpty(getSzrgwServiceSelected()))
         	dbOA.setSelectedSZRGWServiceURL(getSzrgwServiceSelected());
         
+        
+        if (MiscUtil.isNotEmpty(getEidServiceSelected()))
+        	dbOA.setSelectedEIDServiceURL(getEidServiceSelected());
+        
         if (authUser.isAdmin()) {
 
             //store BKU-URLs
@@ -800,7 +826,18 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 		return szrgwServicesList;
 	}
 
+	public List<String> getEidServicesList() {
+		return eidServicesList;
+	}
+
+	public String getEidServiceSelected() {
+		return eidServiceSelected;
+	}
 	
+	public void setEidServiceSelected(String eidServiceSelected) {
+		this.eidServiceSelected = eidServiceSelected;
+	}
+
 	public boolean isSl20Active() {
 		return sl20Active;
 	}
@@ -820,7 +857,9 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 		else
 			this.sl20EndPoints = sl20EndPoints;
 	}
+
+	public boolean isMoaidMode() {
+		return isMoaidMode;
+	}
 		
-	
-	
 }