diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-12-19 13:55:23 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-12-19 13:55:23 +0100 |
| commit | 8b1813ea228048b6795c4a1c09b05480d5a59cb4 (patch) | |
| tree | 907780dc1a93201e123ecf73167429c9e0d6b84d /id/server | |
| parent | 25b658c5884762cc87f727a2a1896cf4420e5dc1 (diff) | |
| download | moa-id-spss-8b1813ea228048b6795c4a1c09b05480d5a59cb4.tar.gz moa-id-spss-8b1813ea228048b6795c4a1c09b05480d5a59cb4.tar.bz2 moa-id-spss-8b1813ea228048b6795c4a1c09b05480d5a59cb4.zip | |
update interface of DefaultGUIFormBuilderConfiguration, because putCustomParameter(...) implementation only support values of type String
Diffstat (limited to 'id/server')
3 files changed, 4 insertions, 7 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java index aaa57fb1d..7f183c5eb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java @@ -632,7 +632,7 @@ public class AuthenticationManager extends MOAIDAuthConstants { config.putCustomParameterWithOutEscaption("redirectURLs", sloReqList); config.putCustomParameterWithOutEscaption("timeoutURL", timeOutURL); - config.putCustomParameter("timeout", SLOTIMEOUT); + config.putCustomParameter("timeout", String.valueOf(SLOTIMEOUT)); guiBuilder.build(httpResp, config, "Single-LogOut GUI"); diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/DefaultGUIFormBuilderConfiguration.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/DefaultGUIFormBuilderConfiguration.java index 901dbae53..8cc7040dc 100644 --- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/DefaultGUIFormBuilderConfiguration.java +++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/DefaultGUIFormBuilderConfiguration.java @@ -91,14 +91,11 @@ public class DefaultGUIFormBuilderConfiguration extends AbstractGUIFormBuilderCo * @param key velocity context key * @param value of this key */ - public void putCustomParameter(String key, Object value) { + public void putCustomParameter(String key, String value) { if (customParameters == null) customParameters = new HashMap<String, Object>(); - if (value instanceof String) - customParameters.put(key, StringEscapeUtils.escapeHtml((String)value)); - else - customParameters.put(key, StringEscapeUtils.escapeHtml(value.toString())); + customParameters.put(key, StringEscapeUtils.escapeHtml(value)); } diff --git a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/GUIUtils.java b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/GUIUtils.java index 5c66f257d..9cfe12791 100644 --- a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/GUIUtils.java +++ b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/GUIUtils.java @@ -106,7 +106,7 @@ public class GUIUtils { config.putCustomParameter("QRImage", base64EncodedImage); config.putCustomParameterWithOutEscaption("successMsg", "Select the SSO Session in your <i>SSO-Transfer App</i> and scan the QR-Code to start the process."); config.putCustomParameterWithOutEscaption("timeoutURL", containerURL); - config.putCustomParameter("timeout", REFESH_TIMEOUT); + config.putCustomParameter("timeout", String.valueOf(REFESH_TIMEOUT)); guiBuilder.build(response, config, "SSO-Transfer-Module"); |