Fix negotiate for old ui

6a6c13a8 · Tim van Dijen · 4238c9b9 · 6a6c13a8 · 6a6c13a8
Commit 6a6c13a8 authored 6 years ago by Tim van Dijen
--- a/modules/negotiate/lib/Auth/Source/Negotiate.php
+++ b/modules/negotiate/lib/Auth/Source/Negotiate.php
@@ -49,7 +49,6 @@ class Negotiate extends \SimpleSAML\Auth\Source
        if (!extension_loaded('krb5')) {
            throw new \Exception('KRB5 Extension not installed');
        }
-
        // call the parent constructor first, as required by the interface
        parent::__construct($info, $config);

@@ -242,15 +241,13 @@ class Negotiate extends \SimpleSAML\Auth\Source
        $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);

-        $t = new \SimpleSAML\XHTML\Template($config, 'negotiate:redirect.twig');
+        $t = new \SimpleSAML\XHTML\Template($config, 'negotiate:redirect.php');
        $t->data['baseurlpath'] = \SimpleSAML\Module::getModuleURL('negotiate');
        $t->data['url'] = $url;
-        $t->data['json_url'] = $json_url;
        $t->show();
    }


--- a/modules/negotiate/templates/redirect.php
+++ b/modules/negotiate/templates/redirect.php
+<!DOCTYPE HTML>
+<html lang="en-US">
+    <head>
+        <script src="<?php echo $this->data['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="<?php echo $this->data['url']; ?>">here</a>.</p>
+    </body>
+</html>
+