Further twigify negotiate

8d181c0a · Tim van Dijen · 01d42fee · 8d181c0a · 8d181c0a · 8d181c0a
Commit 8d181c0a authored 6 years ago by Tim van Dijen
--- a/modules/negotiate/lib/Auth/Source/Negotiate.php
+++ b/modules/negotiate/lib/Auth/Source/Negotiate.php
@@ -238,22 +238,19 @@ class Negotiate extends \SimpleSAML\Auth\Source
     */
    protected function sendNegotiate($params)
    {
+        $config = \SimpleSAML\Configuration::getInstance();
+
        $url = htmlspecialchars(\SimpleSAML\Module::getModuleURL('negotiate/backend.php', $params));
        $json_url = json_encode($url);

        header('HTTP/1.1 401 Unauthorized');
        header('WWW-Authenticate: Negotiate', false);
-        echo <<<EOF
-<html>
- <head>
-  <script type="text/javascript">window.location = $json_url</script>
-  <title>Redirect to login</title>
- </head>
-<body>
- <p>Your browser seems to have Javascript disabled. Please click <a href="$url">here</a>.</p>
-</body>
-</html>
-EOF;
+
+        $t = new \SimpleSAML\XHTML\Template($config, 'negotiate:redirect.twig');
+        $t->data['baseurlpath'] = \SimpleSAML\Module::getModuleUrl('negotiate');
+        $t->data['url'] = $url;
+        $t->data['json_url'] = $json_url;
+        $t->show();
    }



--- a/modules/negotiate/templates/redirect.twig
+++ b/modules/negotiate/templates/redirect.twig
+<!DOCTYPE HTML>
+<html lang="en-US">
+    <head>
+        <script src="{{ baseurlpath }}/assets/js/redirect.js"></script>
+        <title>Redirect to login</title>
+    </head>
+    <body>
+        <p>Your browser seems to have Javascript disabled. Please click <a id="redirect" href="{{ url }}">here</a>.</p>
+    </body>
+</html>
+
--- a/modules/negotiate/www/assets/js/redirect.js
+++ b/modules/negotiate/www/assets/js/redirect.js
+document.addEventListener('DOMContentLoaded', function () {
+    window.location = document.querySelector('#redirect');
+});