Update so auto works in an iframe for admin

tsugiproject · Mar 4, 2021 · 401febc · 401febc
1 parent b5e2859
commit 401febc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/admin/gate.php b/admin/gate.php
@@ -46,7 +46,9 @@
     }
     $rest_path = \Tsugi\Util\U::rest_path();
     $redirect = U::reconstruct_query($rest_path->current);
-    header("Location: ".$redirect);
+    $redirect = U::addSession($redirect);
+
+    Output::doRedirect($redirect);
     $REDIRECTED = true;
     return;
 }

diff --git a/admin/key/auto.php b/admin/key/auto.php
@@ -1,5 +1,8 @@
 <?php
-if ( ! defined('COOKIE_SESSION') ) define('COOKIE_SESSION', true);
+# Do not use cookie session here. We might be in an iframe and unable to establish
+# a session - thanks trackers!.  Make sure the auto endpoint has the .php or
+# route.php will do cookie session.
+
 require_once("../../config.php");
 session_start();
 require_once("../gate.php");

diff --git a/admin/key/key-detail.php b/admin/key/key-detail.php
@@ -107,7 +107,7 @@
 $retval = CrudForm::updateForm($row, $fields, $current, $from_location, $allow_edit, $allow_delete,$extra_buttons,$titles);
 if ( is_string($retval) ) die($retval);
 echo("</p>\n");
-$autoConfigUrl = $CFG->wwwroot . "/admin/key/auto?tsugi_key=" . $row['key_id'];
+$autoConfigUrl = $CFG->wwwroot . "/admin/key/auto.php?tsugi_key=" . $row['key_id'];
 
 ?>
 <p>

diff --git a/settings/key/key-detail.php b/settings/key/key-detail.php
@@ -117,7 +117,7 @@
 if ( is_string($retval) ) die($retval);
 echo("</p>\n");
 
-$autoConfigUrl = $from_location . "/auto?tsugi_key=" . $row['key_id'];
+$autoConfigUrl = $from_location . "/auto.php?tsugi_key=" . $row['key_id'];
 ?>
 <p>
 <b>LTI Advantage Auto Configuration URL: