1 files changed, 32 insertions, 18 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 729af48f7..a00ae4ccf 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
@@ -7,9 +7,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.apache.commons.io.IOUtils;
 
+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;
 import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol;
@@ -29,32 +31,42 @@ public class LoginFormBuilder {
 	private static String BKU_ONLINE = "#ONLINE#";
 	private static String BKU_HANDY =  "#HANDY#"; 
 	private static String BKU_LOCAL =  "#LOCAL#"; 
-	private static String CONTEXTPATH = "#CONTEXTPATH#";
+	public static String CONTEXTPATH = "#CONTEXTPATH#";
 	private static String MOASESSIONID = "#SESSIONID#";
 		
 	private static String SERVLET = CONTEXTPATH+"/GenerateIframeTemplate";
 	
-	private static String getTemplate() {
+	public static String getTemplate() {
+		String pathLocation ="";
+		InputStream input = null;
+		
+		try {
+			String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();
+			pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
+			File file = new File(new URI(pathLocation));
+			input = new  FileInputStream(file);
+			
+		} catch (ConfigurationException e) {
+			Logger.warn("MOA-ID configuration can not be loaded.");
+			
+		} catch (Exception e) {
+			
+		} 
+		
+		return getTemplate(input);		
+		
+	}
+	
+	public static String getTemplate(InputStream input) {
 
 			String template = null; 
-			InputStream input = null; 
 			
 			try {
-				String pathLocation;
-
-				String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();
-				pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
-				
-				try {
-					File file = new File(new URI(pathLocation));
-					input = new  FileInputStream(file);
-					
-				} catch (FileNotFoundException e)  {
+				if (input == null) {					
 					
 					Logger.warn("No LoginFormTempaltes found. Use Generic Templates from package.");
 					
-					pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;
-					
+					String pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;
 					input = Thread.currentThread()
 							.getContextClassLoader()
 							.getResourceAsStream(pathLocation);
@@ -82,7 +94,7 @@ public class LoginFormBuilder {
 			}
 			return template;
 	}
-
+	
 	public static String buildLoginForm(String modul, String action, OAAuthParameter oaParam, String contextpath, String moaSessionID) {
 		String value = getTemplate();
 		
@@ -99,10 +111,12 @@ public class LoginFormBuilder {
 			value = value.replace(CONTEXTPATH, contextpath);
 			value = value.replace(MOASESSIONID, moaSessionID);
 			
-			value = FormBuildUtils.customiceLayoutBKUSelection(value, oaParam);
+			value = FormBuildUtils.customiceLayoutBKUSelection(value, 
+					oaParam.isShowMandateCheckBox(),
+					oaParam.isOnlyMandateAllowed(),
+					oaParam.getFormCustomizaten());
 						
 		}
 		return value;
 	}
-
 }