From 5bc01dab26425144a41dbece04b642fb963e1315 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 2 Jul 2015 07:26:30 +0200
Subject: devel

---
 .../moa/id/auth/builder/LoginFormBuilder.java      | 38 +++++++++-------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder')

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 a8e5a4253..35717af4d 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
@@ -29,17 +29,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.net.URI;
-import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
-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.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.config.stork.CPEPS;
 import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol;
 import at.gv.egovernment.moa.id.util.FormBuildUtils;
 import at.gv.egovernment.moa.logging.Logger;
@@ -153,26 +151,20 @@ public class LoginFormBuilder {
 			
 			if (oaParam.isShowStorkLogin()) {
 				String pepslist = "";
-				List<CPEPS> cpepsList = null;
-				try {
-					cpepsList = ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS();
-				
-					for (CPEPS current : oaParam.getPepsList())
-						// check if master config has changed...
-						if(cpepsList != null && cpepsList.contains(current)) {
-							String countryName = null;							
-							if (MiscUtil.isNotEmpty(MOAIDAuthConstants.COUNTRYCODE_XX_TO_NAME.get(current.getCountryCode().toUpperCase())))
-								countryName = MOAIDAuthConstants.COUNTRYCODE_XX_TO_NAME.get(current.getCountryCode().toUpperCase());
-							else
-								countryName = current.getCountryCode().toUpperCase();
-							
-							pepslist += "<option value=" + current.getCountryCode() + ">" 
-									+  countryName
-									+ "</option>\n";
-							
-						}
-					
-						value = value.replace(PEPSLIST, pepslist);							
+				try {				
+					for (CPEPS current : oaParam.getPepsList()) {
+						String countryName = null;							
+						if (MiscUtil.isNotEmpty(MOAIDAuthConstants.COUNTRYCODE_XX_TO_NAME.get(current.getCountryCode().toUpperCase())))
+							countryName = MOAIDAuthConstants.COUNTRYCODE_XX_TO_NAME.get(current.getCountryCode().toUpperCase());
+						else
+							countryName = current.getCountryCode().toUpperCase();
+						
+						pepslist += "<option value=" + current.getCountryCode() + ">" 
+								+  countryName
+								+ "</option>\n";
+												
+						value = value.replace(PEPSLIST, pepslist);	
+					}
 							
 				} catch (NullPointerException e) {
 					
-- 
cgit v1.2.3