Merge branch 'develop'

UMN-LATIS · Sep 30, 2024 · 2aefcde · 2aefcde
2 parents b7a9437 + 54999af
commit 2aefcde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/application/views/authHelpers/autoRedirect.php b/application/views/authHelpers/autoRedirect.php
@@ -60,6 +60,11 @@ function (f) {
 
           document.cookie = "_check_is_passive=" + window.location + ";path=/; SameSite=None; Secure";
           // Redirect to Shibboleth handler
+          
+          if(typeof basePath == "undefined") {
+
+            basePath = window.Elevator.config.instance.base.path;
+          }
           window.location.href = "https://" + window.location.hostname + "/Shibboleth.sso/Login?isPassive=true&target=" + encodeURIComponent("https://"+window.location.hostname + basePath + "/loginManager/remoteLogin/true?redirect=" + encodeURIComponent(window.location));
 
         }

diff --git a/application/views/vueTemplate.php b/application/views/vueTemplate.php
@@ -77,7 +77,7 @@ function makeJavaScriptConfig($instance, $config, $template) {
     window.Elevator.config.instance.base.origin = window.location.origin;
     window.Elevator.config.instance.base.url = `${window.location.origin}${window.Elevator.config.instance.base.path}`;
   </script>
-
+  <?=$this->user_model->getAuthHelper()->templateView();?>
   <link rel="stylesheet" href="/assets/elevator-ui/dist/<?= $cssFile ?>">
   <?php if (isset($this->instance) && $this->instance->getUseCustomCSS()): ?>
     <link rel="stylesheet" href="<?= $customCSSFile ?>?hash=<?= $customCSSHash ?>">