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

4 files changed, 18 insertions, 16 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
index ff3b7b170..c244b64e9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
@@ -34,6 +34,8 @@ import java.net.URISyntaxException;
 
 import org.apache.commons.io.IOUtils;
 
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
@@ -56,6 +58,7 @@ public class LoginFormBuilder {
 	private static String BKU_LOCAL =  "#LOCAL#"; 
 	public static String CONTEXTPATH = "#CONTEXTPATH#";
 	private static String MOASESSIONID = "#SESSIONID#";
+	private static String PEPSLIST = "#PEPSLIST#";
 		
 	private static String SERVLET = CONTEXTPATH+"/GenerateIframeTemplate";
 	
@@ -147,6 +150,15 @@ public class LoginFormBuilder {
 			value = value.replace(CONTEXTPATH, contextpath);
 			value = value.replace(MOASESSIONID, moaSessionID);
 			
+			if (oaParam.isShowStorkLogin()) {
+				String pepslist = "";
+				for (CPEPS current : oaParam.getPepsList())
+					// check if master config has changed...
+					if(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS().contains(current))
+						pepslist += "<option value=" + current.getCountryCode() + ">" + current.getCountryCode() + "</option>\n";
+				value = value.replace(PEPSLIST, pepslist);
+			}
+			
 			value = FormBuildUtils.customiceLayoutBKUSelection(value, 
 					oaParam.isShowMandateCheckBox(),
 					oaParam.isOnlyMandateAllowed(),
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index 2a6bde1e8..13cebdbff 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -50,7 +50,6 @@ import org.w3c.dom.Element;
 
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
 import eu.stork.peps.auth.commons.STORKAuthnRequest;
-
 import at.gv.egovernment.moa.id.auth.validator.InfoboxValidator;
 import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;
 import at.gv.egovernment.moa.id.protocols.oauth20.OAuth20SessionObject;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index d16e85084..492770aad 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -55,6 +55,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
+import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MandatesProfileNameItem;
@@ -398,9 +399,9 @@ public byte[] getSendAssertionTemplate() {
 	
 	return null;	
 }
-  
-    
-  
 
+public List<CPEPS> getPepsList() {
+	return new ArrayList<CPEPS>(oa_auth.getOASTORK().getCPEPS());
+}
 	
 }
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index b9d3eafa7..ef070b8eb 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -815,17 +815,7 @@
                 <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
                 <p>
                   <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
-                    <option value="BE">Belgi&euml;/Belgique</option>
-                    <option value="EE">Eesti</option>
-                    <option value="ES">Espa&ntilde;a</option>
-                    <option value="IS">&Iacute;sland</option>
-                    <option value="IT">Italia</option>
-                    <option value="LI">Liechtenstein</option>
-                    <option value="LT">Lithuania</option>
-                    <option value="PT">Portugal</option>
-                    <option value="SI">Slovenija</option>
-                    <option value="FI">Suomi</option>
-                    <option value="SE">Sverige</option>
+                    #PEPSLIST#
                   </select>
                   <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
                   <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
@@ -853,4 +843,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>