bt-core-app 1.4.156 → 1.4.158

package/dist/bt-core-app.js

@@ -29835,14 +29835,18 @@ function MM() {
 }
 const sy = Symbol(), _M = Symbol(), oy = Symbol(), uy = Symbol();
 function U_(e, t, n) {
-  const a = Ne(sy), r = Ne(uy), l = Ne(oy), i = a.findItem(e.meta.nav ?? e.name) ?? void 0, s = e.meta.requiresAuth !== !1 || (i == null ? void 0 : i.requiresAuth) !== !1, u = e.query.isTraining === "true";
+  const a = Ne(sy), r = Ne(uy), l = Ne(oy), i = a.findItem(e.meta.nav ?? e.name) ?? void 0, s = e.meta.requiresAuth !== !1 || i != null && i.requiresAuth !== !1, u = e.query.isDemo === "true";
   if (a.updateHistory(e, t), !s)
-    return a.updateNavigationProperties(i), e;
-  if (u)
-    return r.logout(), l.startDemo(), e;
-  if (l.endDemo(), r.tryLogin()) {
+    a.updateNavigationProperties(i);
+  else if (u)
+    r.isLoggedIn.value && r.logout(), l.isDemoing.value || l.startDemo();
+  else if (l.isDemoing.value && l.endDemo(), r.tryLogin()) {
     const c = (i == null ? void 0 : i.subscriptions) ?? [], h = (i == null ? void 0 : i.permissions) ?? [];
-    return r.doShow(c, h, "view") ? (a.updateNavigationProperties(i), e) : n;
+    if (r.doShow(c, h, "view")) {
+      a.updateNavigationProperties(i);
+      return;
+    } else
+      return n;
   } else
     return r.login(window.location.pathname), a.updateNavigationProperties(i), n;
 }

package/dist/index.d.ts

@@ -12,6 +12,7 @@ import { Ref } from 'vue';
 import { RemovableRef } from '@vueuse/core';
 import { RouteLocation } from 'vue-router';
 import { RouteLocationNormalized } from 'vue-router';
+import { RouteLocationRaw } from 'vue-router';
 import { Router } from 'vue-router';
 import { ShallowRef } from 'vue';
 import { Store } from 'pinia';
@@ -555,7 +556,7 @@ export declare interface GroupedHeaderOption {
     values: TableColumn[];
 }
 
-export declare function guardRoute(to: RouteLocation, from: RouteLocation, restrictedRoute: RouteLocation): RouteLocation;
+export declare function guardRoute(to: RouteLocationNormalized, from: RouteLocationNormalized, restrictedRoute: RouteLocationRaw): RouteLocationRaw | undefined;
 
 /**tests for whether string is contains in any of the given props of the given value */
 export declare function hasSearch(value: any, str?: string, props?: string[]): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.4.156",
+  "version": "1.4.158",
   "description": "Core app tools for some basic features like navigation, authentication, server apis, and cosmetics",
   "homepage": "https://github.com/BlitzItTech/bt-core",
   "bugs": {