From 731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 23 Jan 2018 14:23:39 +0100 Subject: update mostly all GUI forms to split JavaScript and CSS from html code to support "Content Security-Policy" http headers --- .../src/main/resources/mainGUI/autocommit.js | 5 +++ .../src/main/resources/mainGUI/basic.css | 4 +++ .../src/main/resources/mainGUI/bkudetected.js | 3 ++ .../src/main/resources/mainGUI/bkudetection.js | 6 ++++ .../main/resources/mainGUI/iframeLBKUdetect.html | 33 +++++-------------- .../main/resources/mainGUI/iframeLBKUdetected.html | 12 +++---- .../src/main/resources/mainGUI/redirect.js | 5 +++ .../src/main/resources/mainGUI/slo.js | 20 ++++++++++++ .../main/resources/mainGUI/template_handyBKU.html | 9 ++---- .../main/resources/mainGUI/template_localBKU.html | 9 ++---- .../main/resources/mainGUI/template_onlineBKU.html | 9 ++---- .../main/resources/mainGUI/template_thirdBKU.html | 9 ++---- .../templates/iframeLBKUdetectSPSpecific.html | 4 ++- .../resources/templates/javascript_tempalte.js | 20 +++++++++--- .../main/resources/templates/loginFormFull.html | 19 ++++++----- .../src/main/resources/templates/redirectForm.html | 28 +++++++++++++--- .../src/main/resources/templates/slo_template.html | 37 ++++++---------------- 17 files changed, 123 insertions(+), 109 deletions(-) create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js create mode 100644 id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js (limited to 'id/server/moa-id-frontend-resources/src/main') diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js new file mode 100644 index 000000000..d21a5651d --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js @@ -0,0 +1,5 @@ +function autoCommmit() { + document.forms[0].submit(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css new file mode 100644 index 000000000..4bec163a9 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css @@ -0,0 +1,4 @@ +@charset "utf-8"; + .bgTrans { + background-color:transparent + } \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js new file mode 100644 index 000000000..7e4d2b12f --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js @@ -0,0 +1,3 @@ +document.addEventListener('DOMContentLoaded', function () { + parent.setBKUAvailable(true); +}); \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js new file mode 100644 index 000000000..b991beb60 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js @@ -0,0 +1,6 @@ +function autoCommmit() { + parent.setBKUAvailable(false); + document.forms[0].submit(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html index cbc16cb38..1be548979 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html @@ -1,31 +1,14 @@ -BKU-Erkennung - + BKU-Erkennung + + - - + +
+ + +
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html index 8769c38ad..566ca01bc 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html @@ -1,14 +1,10 @@ -BKU-Erkennung - + BKU-Erkennung + + - - + diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js new file mode 100644 index 000000000..1bba3d5e0 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js @@ -0,0 +1,5 @@ +function autoCommmit() { + document.getElementById('link').click(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js new file mode 100644 index 000000000..c85837c8a --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js @@ -0,0 +1,20 @@ +function sloTimeOut() { + document.getElementById("timeoutURL").click(); +} +function RestartAfterDelay() { + var eDate = null; + var MilliSekZeit = 0; + var SysDatumJetzt = new Date(); + var SysDatumJetztMilli = SysDatumJetzt.getTime(); + + do { + eDate = new Date(); + MilliSekZeit = eDate.getTime(); + } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout); + + sloTimeOut(); +} + +document.addEventListener('DOMContentLoaded', function () { + setTimeout(sloTimeOut, 30000); +}); \ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html index 08071ac3a..7a25367e0 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html @@ -3,14 +3,9 @@ - + - +
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html index b9905c4af..ef2c1ed8e 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html @@ -3,14 +3,9 @@ - + - + name="CustomizedForm" action="" method="post" enctype="multipart/form-data"> Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html index a9932d49d..7a0ae51ad 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html @@ -3,14 +3,9 @@ - + - + Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html index a9932d49d..be8d7aab1 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html @@ -3,14 +3,9 @@ - + - + Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html index 79a217946..aadc3d4cf 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html @@ -2,8 +2,10 @@ BKU-Erkennung + + - + diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js index 0c1f6a561..cc4714006 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js @@ -126,13 +126,12 @@ function isIE() { } } } - function onChangeChecks() { + function onChangeChecks() { if (self.innerWidth < 650) { document.getElementById("moaidform").setAttribute("target","_parent"); } else { document.getElementById("moaidform").removeAttribute("target"); } - } function checkIfBrowserSupportsJava(){ @@ -234,8 +233,21 @@ function isIE() { console.log("Local BKU NOT available") } } catch(e) {console.log("Local BKU detection is not possible! Msg: "+e);} - - } + + } + function setUseMandateFlag(e) { + /*document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);*/ + e.setAttribute("aria-checked", e.checked); + } + + document.addEventListener('resize', onChangeChecks); + document.addEventListener('DOMContentLoaded', function () { + document.querySelector('#mandateCheckBox').addEventListener('click', setUseMandateFlag); + document.querySelector('#moaidform>input[type=submit]').addEventListener('click', setMandateSelection); + document.querySelector('#bkuhandy>input[type=button]').addEventListener('click', bkuHandyClicked); + document.querySelector('#stork button[type=button]').addEventListener('click', storkClicked); + onChangeChecks(); + }); /* function setSSOSelection() { document.getElementById("useSSO").value = "false"; diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html index c4da51dc1..5a4ca66b7 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html @@ -13,7 +13,7 @@ Anmeldung mittels Bürgerkarte oder Handy-Signatur - +

Anmeldung an: $OAName

@@ -26,8 +26,7 @@
+ id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED> - +
HandyBKU - +
- @@ -88,7 +87,7 @@ - + i

diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html index ac3242c89..a27a7ba10 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html @@ -1,13 +1,31 @@ - + + +
- - CLICK to perform a - redirect back to Online Application +
+ + + +
+
+
+

+ >You get redirected ... +

+
+ + +
+
+
+
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html index b3eb18082..4f86f9f14 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html @@ -6,37 +6,12 @@ #if($timeoutURL) - + #end Single LogOut Vorgang ... - -#if($timeoutURL) - -#else - -#end +
#end @@ -77,7 +57,7 @@