From f10baaa115823b8e0d2e6a736559467335a096df Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 10 Dec 2013 18:59:10 +0100
Subject: stork OA config persisted

---
 .../id/configuration/data/oa/OASTORKConfig.java    | 33 ++++++++++++++++++++++
 .../configuration/struts/action/EditOAAction.java  | 16 +++++++++++
 .../validation/oa/OASTORKConfigValidation.java     |  1 +
 .../src/main/webapp/jsp/editOAGeneral.jsp          |  4 +--
 4 files changed, 52 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 74edde653..1884fb808 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -1,5 +1,38 @@
 package at.gv.egovernment.moa.id.configuration.data.oa;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+
 public class OASTORKConfig {
 
+	private boolean isStorkLogonEnabled = false;
+
+	public OASTORKConfig() {
+
+	}
+
+	/**
+	 * Parses the OA config for stork entities.
+	 * 
+	 * @param dbOAConfig
+	 *            the db oa config
+	 */
+	public void parse(OnlineApplication dbOAConfig) {
+		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
+		if (authdata != null) {
+			OASTORK config = authdata.getOASTORK();
+			if(config != null) {
+				setStorkLogonEnabled(config.isStorkLogonEnabled());
+			}
+		}
+	}
+
+	public boolean isStorkLogonEnabled() {
+		return isStorkLogonEnabled;
+	}
+
+	public void setStorkLogonEnabled(boolean enabled) {
+		this.isStorkLogonEnabled = enabled;
+	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index fc66eede4..d5a50836a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -38,6 +38,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OAOAUTH20;
 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.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplicationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
@@ -102,6 +103,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 	private OASSOConfig ssoOA = new OASSOConfig();
 	private OAOAuth20Config oauth20OA = new OAOAuth20Config();
 	private OASTORKConfig storkOA;
+	private OASTORKConfig storkOA = new OASTORKConfig();
 	private FormularCustomization formOA = new FormularCustomization();
 	
 	private InputStream stream;
@@ -160,6 +162,8 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		saml1OA.parse(onlineapplication);
 		oauth20OA.parse(onlineapplication);
 		session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
+
+		storkOA.parse(onlineapplication);
 		
 		Map<String, String> map = new HashMap<String, String>();
 		map.putAll(FormBuildUtils.getDefaultMap());
@@ -952,6 +956,18 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			
 		}
 		
+		
+		// fetch stork configuration from database model
+		OASTORK stork = authoa.getOASTORK();
+		if (stork == null) {
+			// if there is none, create a new one with default values.
+			stork = new OASTORK();
+			authoa.setOASTORK(stork);
+			stork.setStorkLogonEnabled(false);
+		}
+		// transfer the incoming data to the database model
+		stork.setStorkLogonEnabled(storkOA.isStorkLogonEnabled());
+
 		try {
 			if (newentry) {
 				ConfigurationDBUtils.save(dboa);
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index 76183caad..d12d918bd 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -10,6 +10,7 @@ public class OASTORKConfigValidation {
 		
 		List<String> errors = new ArrayList<String>();
 		
+		// we only have a checkbox for now, so no need to validate anything here
 		
 		return errors;
 	}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index aef6aff24..3234c6a86 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -305,8 +305,8 @@
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
 
-						<s:checkbox name="storkOA.useStorkLogon" 
-							value="%{storkOA.useStorkLogon}"
+						<s:checkbox name="storkOA.storkLogonEnabled" 
+							value="%{storkOA.storkLogonEnabled}"
 							labelposition="left"
 							key="webpages.oaconfig.stork.usestork"
 							cssClass="checkbox"
-- 
cgit v1.2.3