aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id/server/data/deploy/conf/moa-id/SLTemplates/template_handyBKU.html9
-rw-r--r--id/server/data/deploy/conf/moa-id/SLTemplates/template_localBKU.html9
-rw-r--r--id/server/data/deploy/conf/moa-id/SLTemplates/template_thirdBKU.html9
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js5
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css4
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js3
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js6
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js20
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html11
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html18
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js5
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html6
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js20
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html35
-rw-r--r--id/server/idserverlib/src/main/resources/templates/pvp_postbinding_template.html18
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js5
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css4
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js3
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js6
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html33
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html12
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js5
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js20
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html9
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html9
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html9
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html9
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html4
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js20
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html19
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html28
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html37
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java2
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java9
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java7
-rw-r--r--id/server/modules/moa-id-module-eIDAS/src/main/resources/resources/templates/eidas_postbinding_template.vm3
-rw-r--r--id/server/modules/moa-id-module-ssoTransfer/src/main/resources/sso_transfer_template.html23
37 files changed, 234 insertions, 220 deletions
diff --git a/id/server/data/deploy/conf/moa-id/SLTemplates/template_handyBKU.html b/id/server/data/deploy/conf/moa-id/SLTemplates/template_handyBKU.html
index 5a335f9a1..e62921efa 100644
--- a/id/server/data/deploy/conf/moa-id/SLTemplates/template_handyBKU.html
+++ b/id/server/data/deploy/conf/moa-id/SLTemplates/template_handyBKU.html
@@ -3,14 +3,9 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
diff --git a/id/server/data/deploy/conf/moa-id/SLTemplates/template_localBKU.html b/id/server/data/deploy/conf/moa-id/SLTemplates/template_localBKU.html
index 329fe6f8d..80d33ff85 100644
--- a/id/server/data/deploy/conf/moa-id/SLTemplates/template_localBKU.html
+++ b/id/server/data/deploy/conf/moa-id/SLTemplates/template_localBKU.html
@@ -3,14 +3,9 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
diff --git a/id/server/data/deploy/conf/moa-id/SLTemplates/template_thirdBKU.html b/id/server/data/deploy/conf/moa-id/SLTemplates/template_thirdBKU.html
index 52abf83fb..928c9f17b 100644
--- a/id/server/data/deploy/conf/moa-id/SLTemplates/template_thirdBKU.html
+++ b/id/server/data/deploy/conf/moa-id/SLTemplates/template_thirdBKU.html
@@ -3,14 +3,9 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js
new file mode 100644
index 000000000..d21a5651d
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/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/data/deploy/conf/moa-id/htmlTemplates/basic.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css
new file mode 100644
index 000000000..4bec163a9
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css
@@ -0,0 +1,4 @@
+@charset "utf-8";
+ .bgTrans {
+ background-color:transparent
+ } \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js
new file mode 100644
index 000000000..7e4d2b12f
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function () {
+ parent.setBKUAvailable(true);
+}); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js
new file mode 100644
index 000000000..b991beb60
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/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/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
index 0c1f6a561..cc4714006 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/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/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index 1f365c104..5a4ca66b7 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -13,7 +13,7 @@
<title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
</head>
<!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"-->
-<body onload="onChangeChecks();" onresize="onChangeChecks();">
+<body>
<div id="page">
<div id="page1" class="case selected-case" role="main">
<h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2>
@@ -26,8 +26,7 @@
<div id="mandateLogin" style="$MANDATEVISIBLE">
<div>
<input tabindex="1" type="checkbox" name="Mandate"
- id="mandateCheckBox" class="verticalcenter" role="checkbox"
- onClick='document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);'$MANDATECHECKED>
+ id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED>
<label for="mandateCheckBox" class="verticalcenter">in
Vertretung anmelden</label>
<!--a href="info_mandates.html"
@@ -49,7 +48,7 @@
<input type="hidden" name="SSO" id="useSSO" />
<input type="hidden" name="ccc" id="ccc" />
<input type="hidden" name="pendingid" value="$pendingReqID" />
- <input type="submit" value=" Karte " tabindex="4" role="button" onclick="setMandateSelection();">
+ <input type="submit" value=" Karte " tabindex="4" role="button">
</form>
<iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"></iframe>
@@ -60,7 +59,7 @@
</div>
<div id="bkuhandy">
<img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" />
- <input name="bkuButtonHandy" type="button" onClick="bkuHandyClicked();" tabindex="3" role="button" value="HANDY" />
+ <input name="bkuButtonHandy" type="button" tabindex="3" role="button" value="HANDY" />
</div>
</div>
<!--div id="localBKU">
@@ -88,7 +87,7 @@
<select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
$countryList
</select>
- <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
+ <button name="bkuButton" type="button">Proceed</button>
<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
</p>
</div>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
index 45c183215..908582374 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
@@ -5,8 +5,10 @@
##SAMLResponse - String - the Base64 encoded SAML Response
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<body onload="document.forms[0].submit()">
+<head>
+ <script src="$contextPath/autocommit.js"></script>
+</head>
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -14,21 +16,9 @@
</p>
</noscript>
-
<div id="alert">Your login is being processed. Thank you for
waiting.</div>
- <style type="text/css">
-<!--
-#alert {
- margin: 100px 250px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 14px;
- font-weight: normal;
-}
--->
-</style>
-
<form action="${action}" method="post" target="_parent">
<div>
#if($RelayState) <input type="hidden" name="RelayState" value="${RelayState}"/> #end
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js
new file mode 100644
index 000000000..1bba3d5e0
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/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/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
index 7b064e22a..a27a7ba10 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
@@ -1,12 +1,10 @@
<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<script type="text/javascript">
- </script>
+ <script src="$contextPath/redirect.js"></script>
</head>
-
-<body onload="document.getElementById('link').click();">
+<body>
<div id="page">
<div id="page1" class="case selected-case" role="main">
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js
new file mode 100644
index 000000000..c85837c8a
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/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/data/deploy/conf/moa-id/htmlTemplates/slo_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
index 4d9277152..4f86f9f14 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
@@ -6,37 +6,12 @@
<link rel="stylesheet" href="$contextPath/css/buildCSS" />
#if($timeoutURL)
- <script type="text/javascript">
- function sloTimeOut() {
- window.location.href="$timeoutURL";
-
- }
- 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();
- }
-
- </script>
+ <script src="$contextPath/slo.js"></script>
#end
<title>Single LogOut Vorgang ... </title>
</head>
-
-#if($timeoutURL)
- <body onload='setTimeout(sloTimeOut, $timeout);'>
-#else
- <body>
-#end
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -68,6 +43,11 @@
Sie werden von allen Online-Applikationen abgemeldet. <br>
Dieser Vorgang kann einige Zeit in Anspruch nehmen.
</p>
+
+ #if($timeoutURL)
+ <a id="timeoutURL" href="$timeoutURL">Click here if it does not resume after 30 seconds</a>
+ #end
+
</div>
#end
@@ -90,5 +70,6 @@
#foreach( $el in $redirectURLs )
<iframe src=$el class="reqframe"></iframe>
#end
+
</body>
</html> \ No newline at end of file
diff --git a/id/server/idserverlib/src/main/resources/templates/pvp_postbinding_template.html b/id/server/idserverlib/src/main/resources/templates/pvp_postbinding_template.html
index 45c183215..908582374 100644
--- a/id/server/idserverlib/src/main/resources/templates/pvp_postbinding_template.html
+++ b/id/server/idserverlib/src/main/resources/templates/pvp_postbinding_template.html
@@ -5,8 +5,10 @@
##SAMLResponse - String - the Base64 encoded SAML Response
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<body onload="document.forms[0].submit()">
+<head>
+ <script src="$contextPath/autocommit.js"></script>
+</head>
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -14,21 +16,9 @@
</p>
</noscript>
-
<div id="alert">Your login is being processed. Thank you for
waiting.</div>
- <style type="text/css">
-<!--
-#alert {
- margin: 100px 250px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 14px;
- font-weight: normal;
-}
--->
-</style>
-
<form action="${action}" method="post" target="_parent">
<div>
#if($RelayState) <input type="hidden" name="RelayState" value="${RelayState}"/> #end
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 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="de">
<head>
-<title>BKU-Erkennung</title>
-<script type="text/javascript">
-<!--
- bkuprot = location.protocol;
- bkuhost = "localhost";
- bkuport = (bkuprot == "https:" ? 3496 : 3495);
- bkupath = "https-security-layer-request";
- bkuurl = bkuprot + "//" + bkuhost + ":" + bkuport + "/" + bkupath;
-//-->
-</script>
+ <title>BKU-Erkennung</title>
+ <script src="$contextPath/bkudetection.js"></script>
+ <link rel="stylesheet" href="$contextPath/basic.css" />
</head>
-<body style="background-color:transparent">
-<script type="text/javascript">
-<!--
- if (bkuprot == "https:" || bkuprot == "http:") {
- parent.setBKUAvailable(false);
- document.write('<form name="bkudetectform" method="POST" target="bkudetect" action="' + bkuurl + '" enctype="application/x-www-form-urlencoded">');
- document.write('<input type="hidden" name="XMLRequest" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;NullOperationRequest xmlns=&quot;http://www.buergerkarte.at/namespaces/securitylayer/1.2#&quot;/&gt;" />');
- document.write('<input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/>');
- document.write('</form>');
- try {
- document.bkudetectform.submit();
- } catch(e) {console.log(e)}
- }
-//-->
-</script>
+<body class="bgTrans">
+ <form name="bkudetectform" method="POST" target="bkudetect" action="https://localhost:3496/https-security-layer-request" enctype="application/x-www-form-urlencoded">
+ <input type="hidden" name="XMLRequest" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;NullOperationRequest xmlns=&quot;http://www.buergerkarte.at/namespaces/securitylayer/1.2#&quot;/&gt;" />
+ <input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/>
+ </form>
</body>
</html>
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 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="de">
<head>
-<title>BKU-Erkennung</title>
-<script type="text/javascript">
- parent.setBKUAvailable(true);
-</script>
+ <title>BKU-Erkennung</title>
+ <script src="bkudetected.js"></script>
+ <link rel="stylesheet" href="basic.css" />
</head>
-<body style="background-color:transparent">
-<script type="text/javascript">
- parent.setBKUAvailable(true);
-</script>
+<body class="bgTrans">
</body>
</html>
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 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
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 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
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 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
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 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <script language="javascript" type="text/javascript">
- function onAnmeldeSubmit() {
- document.CustomizedForm.submit();
- document.CustomizedForm.Senden.disabled=true;
- }
- </script>
+ <script src="<ContextURL>/autocommit.js"></script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body>
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
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 @@
<html lang="de">
<head>
<title>BKU-Erkennung</title>
+ <script src="$contextPath/bkudetection.js"></script>
+ <link rel="stylesheet" href="$contextPath/basic.css" />
</head>
-<body style="background-color:transparent" onload="parent.setBKUAvailable(false);document.forms[0].submit();">
+<body class="bgTrans">
<form name="bkudetectform" method="POST" target="bkudetect" action="$bkuURLLocal" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="XMLRequest" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;NullOperationRequest xmlns=&quot;http://www.buergerkarte.at/namespaces/securitylayer/1.2#&quot;/&gt;" />
<input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/>
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 @@
<title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
</head>
<!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"-->
-<body onload="onChangeChecks();" onresize="onChangeChecks();">
+<body>
<div id="page">
<div id="page1" class="case selected-case" role="main">
<h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2>
@@ -26,8 +26,7 @@
<div id="mandateLogin" style="$MANDATEVISIBLE">
<div>
<input tabindex="1" type="checkbox" name="Mandate"
- id="mandateCheckBox" class="verticalcenter" role="checkbox"
- onClick='document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);'$MANDATECHECKED>
+ id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED>
<label for="mandateCheckBox" class="verticalcenter">in
Vertretung anmelden</label>
<!--a href="info_mandates.html"
@@ -49,20 +48,20 @@
<input type="hidden" name="SSO" id="useSSO" />
<input type="hidden" name="ccc" id="ccc" />
<input type="hidden" name="pendingid" value="$pendingReqID" />
- <input type="submit" value=" Karte " tabindex="4" role="button" onclick="setMandateSelection();">
- </form>
+ <input type="submit" value=" Karte " tabindex="4" role="button">
+ </form>
+
<iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"></iframe>
<!-- BKU detection with static template-->
<!--iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/iframeLBKUdetect.html"></iframe-->
-
+
</div>
<div id="bkuhandy">
<img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" />
- <input name="bkuButtonHandy" type="button" onClick="bkuHandyClicked();" tabindex="3" role="button" value="HANDY" />
+ <input name="bkuButtonHandy" type="button" tabindex="3" role="button" value="HANDY" />
</div>
</div>
-
<!--div id="localBKU">
<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
class="verticalcenter" target="_parent">
@@ -74,7 +73,7 @@
<input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
role="button" onclick="setMandateSelection();">
</form>
- <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection"><\/iframe>
+ <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"><\/iframe>
</div-->
<!-- Single Sign-On Session transfer functionality -->
@@ -88,7 +87,7 @@
<select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
$countryList
</select>
- <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
+ <button name="bkuButton" type="button">Proceed</button>
<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
</p>
</div>
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 @@
<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<script type="text/javascript">
- </script>
+ <script src="$contextPath/redirect.js"></script>
</head>
+<body>
+ <div id="page">
-<body onload="document.getElementById('link').click();">
- <a href="$URL" target="$TARGET" id="link">CLICK to perform a
- redirect back to Online Application</a>
+ <div id="page1" class="case selected-case" role="main">
+
+<!-- <h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
+
+ <div id="main">
+ <div id="leftcontent" class="hell">
+ <div id="bku_header" class="dunkel">
+ <h2 id="tabheader" class="dunkel" role="heading">
+ >You get redirected ...
+ </h2>
+ </div>
+
+ <div id="selectArea" class="hell" role="application">
+ <a href="$URL" target="$TARGET" id="link">Click here if it does not resume</a>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</body>
</html>
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 @@
<link rel="stylesheet" href="$contextPath/css/buildCSS" />
#if($timeoutURL)
- <script type="text/javascript">
- function sloTimeOut() {
- window.location.href="$timeoutURL";
-
- }
- 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();
- }
-
- </script>
+ <script src="$contextPath/slo.js"></script>
#end
<title>Single LogOut Vorgang ... </title>
</head>
-
-#if($timeoutURL)
- <body onload='setTimeout(sloTimeOut, $timeout);'>
-#else
- <body>
-#end
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -68,6 +43,11 @@
Sie werden von allen Online-Applikationen abgemeldet. <br>
Dieser Vorgang kann einige Zeit in Anspruch nehmen.
</p>
+
+ #if($timeoutURL)
+ <a id="timeoutURL" href="$timeoutURL">Click here if it does not resume after 30 seconds</a>
+ #end
+
</div>
#end
@@ -77,7 +57,7 @@
<!--div id="validation">
<a href="http://validator.w3.org/check?uri="> <img
style="border: 0; width: 88px; height: 31px"
- src="$contextpath/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
+ src="$contextPath/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
style="border: 0; width: 88px; height: 31px"
src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
@@ -90,5 +70,6 @@
#foreach( $el in $redirectURLs )
<iframe src=$el class="reqframe"></iframe>
#end
+
</body>
</html> \ No newline at end of file
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index faeb0158b..f7c3db8d1 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -213,7 +213,7 @@ public class AuthenticationServer extends BaseAuthenticationServer {
try {
String htmlForm = new GetIdentityLinkFormBuilder().build(template,
session.getBkuURL(), infoboxReadRequest, dataURL, null,
- null, pushInfobox, oaParam, appletheigth, appletwidth);
+ null, pushInfobox, oaParam, appletheigth, appletwidth, pendingReq.getAuthURL());
return htmlForm;
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index ef81af94b..f7aba5e53 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -78,6 +78,9 @@ public class GetIdentityLinkFormBuilder extends Builder {
// private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
/** special tag in the HTML template to be substituted for the infoboxes to be pushed from the BKU */
private static final String PUSHINFOBOX_TAG = "<PushInfobox>";
+
+ private static final String CONTEXTURL_TAG = "<ContextURL>";
+
/** special tag in the HTML template to be substituted for the BKU URL */
/** private static int all contains the representation to replace all tags*/
private static final int ALL = -1;
@@ -155,7 +158,8 @@ public class GetIdentityLinkFormBuilder extends Builder {
String certInfoDataURL,
String pushInfobox, IOAAuthParameters oaParam,
String appletheigth,
- String appletwidth)
+ String appletwidth,
+ String contextURL)
throws BuildException
{
String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
@@ -163,6 +167,9 @@ public class GetIdentityLinkFormBuilder extends Builder {
htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest), true, ALL);
htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL, true, ALL);
htmlForm = replaceTag(htmlForm, PUSHINFOBOX_TAG, pushInfobox, false, ALL);
+
+ htmlForm = replaceTag(htmlForm, CONTEXTURL_TAG, contextURL, false, ALL);
+
//new:wird oben mitreplaced htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
index 7b364789b..f8c9fd75b 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
@@ -48,11 +48,10 @@ package test.at.gv.egovernment.moa.id.auth.builder;
import java.text.MessageFormat;
-import junit.framework.TestCase;
-
import at.gv.egovernment.moa.id.auth.builder.CertInfoVerifyXMLSignatureRequestBuilder;
import at.gv.egovernment.moa.id.auth.builder.GetIdentityLinkFormBuilder;
import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilder;
+import junit.framework.TestCase;
/**
* @author Paul Ivancsics
@@ -99,7 +98,7 @@ public class GetIdentityLinkFormBuilderTest extends TestCase {
String dataURL = "https://1.2.3.4/auth/VerifyIdentityLink?MOASessionID=1234567";
String infoRequest = new CertInfoVerifyXMLSignatureRequestBuilder().build();
String infoDataURL = "https://1.2.3.4/auth/StartAuthentication?Target=gb&OA=https://oa.gv.at/";
- String form = new GetIdentityLinkFormBuilder().build(null, null, xmlRequest, dataURL, infoRequest, infoDataURL, null, null, null, null);
+ String form = new GetIdentityLinkFormBuilder().build(null, null, xmlRequest, dataURL, infoRequest, infoDataURL, null, null, null, null, null);
String formShould = MessageFormat.format(
FORM, new Object[] { BKU, xmlRequest, dataURL, infoRequest, infoDataURL });
assertEquals(formShould, form);
@@ -110,7 +109,7 @@ public class GetIdentityLinkFormBuilderTest extends TestCase {
String infoRequest = new CertInfoVerifyXMLSignatureRequestBuilder().build();
String infoDataURL = "https://1.2.3.4/auth/StartAuthentication?Target=gb&OA=https://oa.gv.at/";
String bkuURL = "http://bku.at/";
- String form = new GetIdentityLinkFormBuilder().build(null, bkuURL, xmlRequest, dataURL, infoRequest, infoDataURL, null, null, null, null);
+ String form = new GetIdentityLinkFormBuilder().build(null, bkuURL, xmlRequest, dataURL, infoRequest, infoDataURL, null, null, null, null, null);
String formShould = MessageFormat.format(
FORM, new Object[] { bkuURL, xmlRequest, dataURL, infoRequest, infoDataURL });
assertEquals(formShould, form);
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/resources/resources/templates/eidas_postbinding_template.vm b/id/server/modules/moa-id-module-eIDAS/src/main/resources/resources/templates/eidas_postbinding_template.vm
index 0535d48b6..62ee81f99 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/resources/resources/templates/eidas_postbinding_template.vm
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/resources/resources/templates/eidas_postbinding_template.vm
@@ -11,9 +11,10 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <script src="autocommit.js"></script>
</head>
- <body onload="document.forms[0].submit()">
+ <body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support JavaScript,
diff --git a/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/sso_transfer_template.html b/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/sso_transfer_template.html
index c2195d300..1cd676ce9 100644
--- a/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/sso_transfer_template.html
+++ b/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/sso_transfer_template.html
@@ -5,25 +5,14 @@
<!-- MOA-ID 2.x BKUSelection Layout CSS -->
<link rel="stylesheet" href="$contextPath/css/buildCSS" />
- #if($timeoutURL)
- <script type="text/javascript">
- function sloTimeOut() {
- window.location.href="$timeoutURL";
-
- }
-
- </script>
+ #if($timeoutURL)
+ <script src="$contextPath/slo.js"></script>
#end
<title>Single Sign-On Session Transfer</title>
</head>
-
-#if($timeoutURL)
- <body onload='setTimeout(sloTimeOut, $timeout);'>
-#else
- <body>
-#end
+<body>
<!--body-->
<noscript>
@@ -59,6 +48,12 @@
</div>
#end
+ #if($timeoutURL)
+ <div>
+ <a id="timeoutURL" href="$timeoutURL">Click here if it does not resume after 30 seconds</a>
+ </div>
+ #end
+
<!--/div-->
</div>
</div>