bt-core-app 2.0.136 → 2.0.138

package/dist/bt-core-app.js

@@ -9465,7 +9465,7 @@ function pP(e) {
   function v(A) {
     return e.getAuthorizeUrl ?? (e.getAuthorizeUrl = (L, V) => {
       const P = yn(xv(), `authorize?response_type=code&client_id=${e.oauthClientID}&redirect_uri=${window.location.origin}/authentication&state=${V}`);
-      return L ? `${P}&redirect_path=${L}` : P;
+      return console.log("redirect: " + L), L != null ? `${P}&redirect_path=${L}` : P;
     }), e.getAuthorizeUrl != null ? e.getAuthorizeUrl(A, n.value) ?? "" : "";
   }
   function f(A) {
@@ -9497,8 +9497,8 @@ function pP(e) {
     return e.tryRefreshToken ?? (e.tryRefreshToken = async () => {
       if (e.useTokenRefresh !== !0 || ia(r.value.refreshToken) || ia(r.value.refreshExpiresOn))
         return;
-      const A = it.fromFormat(r.value.refreshExpiresOn, t), L = it.fromFormat(r.value.expiresOn, t), V = it.utc().toString(), P = L.plus({ minutes: 0 - a });
-      if (!(V > A.toString()) && !(V < P.toString())) {
+      const A = it.fromFormat(r.value.refreshExpiresOn, t), L = it.fromFormat(r.value.expiresOn, t), V = it.utc().toFormat(t), P = L.plus({ minutes: 0 - a });
+      if (!(V > A.toFormat(t)) && !(V < P.toFormat(t))) {
         var E = yn(xv(), e.tokenRefreshPath ?? "refreshtoken");
         try {
           var $ = await fetch(E, {
@@ -9564,9 +9564,14 @@ function pP(e) {
     var A;
     r.value ?? (r.value = {}), (A = r.value).timeZone ?? (A.timeZone = e.defaultTimeZone ?? Wp);
   }
-  function C() {
-    const A = vt(r);
-    return A.isLoggedIn && D() && _() && (m(), window.location.href = v()), A.isLoggedIn;
+  function C(A, L) {
+    const V = vt(r);
+    if (V.isLoggedIn && D() && _()) {
+      m();
+      let P = v(A);
+      L != null && (P.includes("?") || (P = P + "?"), P.includes("&") && (P = P + "&"), P = P + new URLSearchParams(L).toString()), window.location.href = P;
+    }
+    return V.isLoggedIn;
   }
   function _() {
     if (!e.useTokenRefresh || ia(r.value.refreshExpiresOn) || ia(r.value.refreshToken))
@@ -14043,7 +14048,7 @@ function rse(e, t, a, n) {
   if (e.query.isDemo === "true" && !i.isDemoing.value && i.startDemo(), d(), s)
     if (i.isDemoing.value)
       l.updateNavigationChange(e, t);
-    else if (r.tryLogin()) {
+    else if (r.tryLogin(window.location.pathname)) {
       const f = (o == null ? void 0 : o.subscriptions) ?? [], g = (o == null ? void 0 : o.permissions) ?? [];
       if (f.push(...u), g.push(...c), r.doShow(f, g, "view")) {
         l.updateNavigationChange(e, t);
@@ -14051,7 +14056,7 @@ function rse(e, t, a, n) {
       } else
         return { name: a };
     } else
-      return r.login(window.location.pathname), { name: a };
+      return r.login(window.location.pathname), { path: "/" };
   else if (l.updateNavigationChange(e, t), e.path == "/" && r.tryLogin() && ia((v = t.name) == null ? void 0 : v.toString()))
     return { name: n };
 }

package/dist/index.d.ts

@@ -260,7 +260,7 @@ export declare interface BTAuth {
     testToken: () => Promise<boolean>;
     timeZone: ComputedRef<string>;
     tokenExpired: () => boolean;
-    tryLogin: () => boolean | undefined;
+    tryLogin: (redirectPath?: string, query?: any) => boolean | undefined;
     tryRefreshToken: () => Promise<void>;
 }
 
@@ -992,6 +992,10 @@ export declare interface GroupedHeaderOption {
 
 export declare function guardRoute(to: RouteLocationNormalized, from: RouteLocationNormalized, restrictedName: string, loggedInHome: string): {
     name: string;
+    path?: undefined;
+} | {
+    path: string;
+    name?: undefined;
 } | undefined;
 
 /**tests for whether string is contains in any of the given props of the given value */

package/package.json

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