Fixed OIDC Logout

[bookstack] / resources / js / app.js

diff --git a/resources/js/app.js b/resources/js/app.js
index ccf54b33d1a7f609b7dfe3928b8a462cbf8252fa..5b822e9009e26f58f4695215c4570c9a86bd59de 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,19 +1,20 @@
-import events from './services/events';
-import httpInstance from './services/http';
+import * as events from './services/events';
+import * as httpInstance from './services/http';

 import Translations from './services/translations';
 
 import * as components from './services/components';
 import * as componentMap from './components';
 
 // Url retrieval function
 import Translations from './services/translations';
 
 import * as components from './services/components';
 import * as componentMap from './components';
 
 // Url retrieval function

-window.baseUrl = function(path) {
+window.baseUrl = function baseUrl(path) {
+    let targetPath = path;

     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');
     if (basePath[basePath.length - 1] === '/') basePath = basePath.slice(0, basePath.length - 1);
     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');
     if (basePath[basePath.length - 1] === '/') basePath = basePath.slice(0, basePath.length - 1);

-    if (path[0] === '/') path = path.slice(1);
-    return `${basePath}/${path}`;
+    if (targetPath[0] === '/') targetPath = targetPath.slice(1);
+    return `${basePath}/${targetPath}`;

 };
 
 };
 

-window.importVersioned = function(moduleName) {
+window.importVersioned = function importVersioned(moduleName) {

     const version = document.querySelector('link[href*="/dist/styles.css?version="]').href.split('?version=').pop();
     const importPath = window.baseUrl(`dist/${moduleName}.js?version=${version}`);
     return import(importPath);
     const version = document.querySelector('link[href*="/dist/styles.css?version="]').href.split('?version=').pop();
     const importPath = window.baseUrl(`dist/${moduleName}.js?version=${version}`);
     return import(importPath);