bt-core-app 2.2.45 → 2.2.47

package/dist/composables/auth.mjs

@@ -1,151 +1,148 @@
-import { isLengthyArray as B, appendUrl as w, isNullOrEmpty as v, jwtDecrypt as J } from "./helpers.mjs";
+import { isLengthyArray as q, appendUrl as S, isNullOrEmpty as v, jwtDecrypt as B } from "./helpers.mjs";
 import m from "../bt-core/core/node_modules/luxon/src/datetime.mjs";
 import "../bt-core/core/node_modules/luxon/src/duration.mjs";
-import { useStorage as K } from "@vueuse/core";
-import { ref as j, computed as L, toValue as o } from "vue";
-import { useAuthUrl as S } from "./urls.mjs";
-import { useApi as C } from "./api.mjs";
-let I = "Australia/Melbourne", O;
-const R = "auth-credentials-state";
-function ue() {
-  return O;
+import { useStorage as J } from "@vueuse/core";
+import { ref as K, computed as L, toValue as o } from "vue";
+import { useAuthUrl as k } from "./urls.mjs";
+import { useApi as R } from "./api.mjs";
+let b = "Australia/Melbourne", I;
+const C = "auth-credentials-state";
+function ne() {
+  return I;
 }
-function ie(n) {
-  const c = n.expiryTokenFormat ?? "d/MM/yyyy h:mm:ss a", D = n.tokenRefreshMinuteWindow ?? 10800;
-  let h = j(localStorage.getItem(R) ?? "");
-  h.value.length == 0 && x();
-  function x() {
-    h.value = Math.random().toString(36).substring(4, 19) + Math.random().toString(12).substring(1, 11), localStorage.setItem(R, h.value);
+function ue(u) {
+  const c = u.expiryTokenFormat ?? "d/MM/yyyy h:mm:ss a", D = u.tokenRefreshMinuteWindow ?? 10800;
+  let h = K(localStorage.getItem(C) ?? "");
+  h.value.length == 0 && O();
+  function O() {
+    h.value = Math.random().toString(36).substring(4, 19) + Math.random().toString(12).substring(1, 11), localStorage.setItem(C, h.value);
   }
-  const i = K("auth-credentials", {});
-  n.menu != null && (n.menu.currentView.value = i.value.subscriptionCode);
-  function F(e) {
-    if (e == null)
-      return !0;
-    var r = n.getAuthItem != null ? n.getAuthItem(e) : null;
+  const i = J("auth-credentials", {});
+  u.menu != null && (u.menu.currentView.value = i.value.subscriptionCode);
+  function F(r) {
     if (r == null)
+      return !0;
+    var e = u.getAuthItem != null ? u.getAuthItem(r) : null;
+    if (e == null)
       return !1;
-    if (r.requiresAuth === !1)
+    if (e.requiresAuth === !1)
       return !0;
     const t = o(i);
-    if (t.isSuspended && r.ignoreSuspension !== !0)
+    if (t.isSuspended && e.ignoreSuspension !== !0)
       return !1;
     if (t.isGlobalAdmin)
       return !0;
-    if (r.permissions != null && r.permissions.length > 0) {
-      if (Array.isArray(r.permissions[0])) {
-        if (r.permissions.every((s) => s.some((a) => !d(a))))
+    if (e.permissions != null && e.permissions.length > 0) {
+      if (Array.isArray(e.permissions[0])) {
+        if (e.permissions.every((l) => l.some((a) => !d(a))))
           return !1;
       } else
-        for (var u = 0; u < r.permissions.length; u++)
-          if (!d(r.permissions[u]))
+        for (var n = 0; n < e.permissions.length; n++)
+          if (!d(e.permissions[n]))
             return !1;
     }
     return !0;
   }
-  function d(e) {
-    const r = o(i);
-    if (r.userPermissions != null)
-      for (var t = 0; t < r.userPermissions.length; t++) {
-        var u = r.userPermissions[t].split(".");
-        if (r.userPermissions[t] == "everything.edit" || e == u[0] && u.length > 1 && u[1] == "edit")
+  function d(r) {
+    const e = o(i);
+    if (e.userPermissions != null)
+      for (var t = 0; t < e.userPermissions.length; t++) {
+        var n = e.userPermissions[t].split(".");
+        if (e.userPermissions[t] == "everything.edit" || r == n[0] && n.length > 1 && n[1] == "edit")
           return !0;
       }
     return !1;
   }
-  function _(e) {
-    if (e == null)
-      return !0;
-    var r = n.getAuthItem != null ? n.getAuthItem(e) : null;
+  function _(r) {
     if (r == null)
+      return !0;
+    var e = u.getAuthItem != null ? u.getAuthItem(r) : null;
+    if (e == null)
       return !1;
-    if (r.requiresAuth === !1)
+    if (e.requiresAuth === !1)
       return !0;
     const t = o(i);
-    if (t.isSuspended && r.ignoreSuspension !== !0)
+    if (t.isSuspended && e.ignoreSuspension !== !0)
       return !1;
     if (t.isGlobalAdmin)
       return !0;
-    if (r.permissions != null && r.permissions.length > 0) {
-      if (Array.isArray(r.permissions[0])) {
-        if (r.permissions.every((s) => s.some((a) => !g(a))))
+    if (e.permissions != null && e.permissions.length > 0) {
+      if (Array.isArray(e.permissions[0])) {
+        if (e.permissions.every((l) => l.some((a) => !g(a))))
           return !1;
       } else
-        for (var u = 0; u < r.permissions.length; u++)
-          if (!g(r.permissions[u]))
+        for (var n = 0; n < e.permissions.length; n++)
+          if (!g(e.permissions[n]))
             return !1;
     }
     return !0;
   }
-  function g(e) {
-    const r = o(i);
-    if (r.userPermissions != null)
-      for (var t = 0; t < r.userPermissions.length; t++) {
-        var u = r.userPermissions[t].split(".");
-        if (e == u[0] || e == "everything" || r.userPermissions[t] == "everything.view" || r.userPermissions[t] == "everything.edit")
+  function g(r) {
+    const e = o(i);
+    if (e.userPermissions != null)
+      for (var t = 0; t < e.userPermissions.length; t++) {
+        var n = e.userPermissions[t].split(".");
+        if (r == n[0] || r == "everything" || e.userPermissions[t] == "everything.view" || e.userPermissions[t] == "everything.edit")
           return !0;
       }
     return !1;
   }
-  function E(e, r, t) {
-    let u = !0, s = !0;
-    return e != null && e.length > 0 && (e.some((l) => V(l)) || (s = !1)), s ? o(i).isGlobalAdmin ? !0 : (r != null && r.length > 0 && (Array.isArray(r[0]) ? t == "edit" ? r.some((l) => l.every((f) => d(f))) || (u = !1) : r.some((l) => l.every((f) => g(f))) || (u = !1) : r.forEach((l) => {
-      t == "edit" ? d(l) || (u = !1) : g(l) || (u = !1);
-    })), u) : !1;
+  function x(r, e, t) {
+    let n = !0, l = !0;
+    return r != null && r.length > 0 && (r.some((s) => V(s)) || (l = !1)), l ? o(i).isGlobalAdmin ? !0 : (e != null && e.length > 0 && (Array.isArray(e[0]) ? t == "edit" ? e.some((s) => s.every((f) => d(f))) || (n = !1) : e.some((s) => s.every((f) => g(f))) || (n = !1) : e.forEach((s) => {
+      t == "edit" ? d(s) || (n = !1) : g(s) || (n = !1);
+    })), n) : !1;
   }
-  function p(e, r = !1) {
-    var t = n.getAuthItem != null ? n.getAuthItem(e) : null;
-    let u = !1;
+  function p(r, e = !1) {
+    var t = u.getAuthItem != null ? u.getAuthItem(r) : null;
+    let n = !1;
     if (t == null)
       return !1;
-    let s = t.subscriptions ?? [], a = t.permissions ?? [], l = E(s, a, "view");
-    return l || !r || !B(t.children) ? l : ((t == null ? void 0 : t.children) != null && t.children.forEach((f) => {
-      p(f, !0) && (u = !0);
-    }), u);
+    let l = t.subscriptions ?? [], a = t.permissions ?? [], s = x(l, a, "view");
+    return s || !e || !q(t.children) ? s : ((t == null ? void 0 : t.children) != null && t.children.forEach((f) => {
+      p(f, !0) && (n = !0);
+    }), n);
   }
-  function k(e) {
-    return n.getAuthorizeUrl ?? (n.getAuthorizeUrl = (r, t) => {
-      const u = w(S(), `authorize?response_type=code&client_id=${n.oauthClientID}&redirect_uri=${window.location.origin}/authentication&state=${t}`);
-      return r != null ? `${u}&redirect_path=${r}` : u;
-    }), n.getAuthorizeUrl != null ? n.getAuthorizeUrl(e, h.value) ?? "" : "";
+  function w(r) {
+    return u.getAuthorizeUrl ?? (u.getAuthorizeUrl = (e, t) => {
+      const n = S(k(), `authorize?response_type=code&client_id=${u.oauthClientID}&redirect_uri=${window.location.origin}/authentication&state=${t}`);
+      return e != null ? `${n}&redirect_path=${e}` : n;
+    }), u.getAuthorizeUrl != null ? u.getAuthorizeUrl(r, h.value) ?? "" : "";
   }
-  function P(e) {
+  function E(r) {
     var t;
-    return e == null ? 0 : ((t = (n.subscriptionOptions ?? []).find((u) => u.code == e)) == null ? void 0 : t.value) ?? 0;
+    return r == null ? 0 : ((t = (u.subscriptionOptions ?? []).find((n) => n.code == r)) == null ? void 0 : t.value) ?? 0;
   }
-  function V(e) {
-    const r = o(i);
-    if (r.subscriptionCode == null)
+  function V(r) {
+    const e = o(i);
+    if (e.subscriptionCode == null)
       return !1;
-    if (r.subscriptionCode == e)
+    if (e.subscriptionCode == r)
       return !0;
-    const t = P(e), u = P(r.subscriptionCode);
-    return t <= u;
-  }
-  async function Z(e) {
-    i.value = void 0, A(), n.firebase != null && await n.firebase.unregister(), e != null && n.router != null && n.router.currentRoute.value.path != e && n.router.push({ path: e });
+    const t = E(r), n = E(e.subscriptionCode);
+    return t <= n;
   }
-  function y(e) {
-    i.value = void 0, A(), e != null && n.router != null && n.router.currentRoute.value.path != e && n.router.push({ path: e });
+  function y(r) {
+    i.value = void 0, P(), r != null && u.router != null && u.router.currentRoute.value.path != r && u.router.push({ path: r });
   }
-  function G(e, r) {
+  function Z(r, e) {
     const t = o(i);
-    if (b() || !t.isLoggedIn) {
+    if (A() || !t.isLoggedIn) {
       y();
-      let u = k(e);
-      r != null && (u.includes("?") || (u = u + "?"), u.includes("&") && (u = u + "&"), u = u + new URLSearchParams(r).toString()), window.location.href = u;
+      let n = w(r);
+      e != null && (n.includes("?") || (n = n + "?"), n.includes("&") && (n = n + "&"), n = n + new URLSearchParams(e).toString()), window.location.href = n;
     } else
-      !v(e) && n.router != null && n.router.push({ path: e });
+      !v(r) && u.router != null && u.router.push({ path: r });
   }
-  async function M() {
-    return n.tryRefreshToken ?? (n.tryRefreshToken = async () => {
-      if (n.useTokenRefresh !== !0 || v(i.value.refreshToken) || v(i.value.refreshExpiresOn))
+  async function G() {
+    return u.tryRefreshToken ?? (u.tryRefreshToken = async () => {
+      if (u.useTokenRefresh !== !0 || v(i.value.refreshToken) || v(i.value.refreshExpiresOn))
         return;
-      const e = m.fromFormat(i.value.refreshExpiresOn, c), r = m.fromFormat(i.value.expiresOn, c), t = m.utc().toFormat(c), u = r.plus({ minutes: 0 - D });
-      if (!(t > e.toFormat(c)) && !(t < u.toFormat(c))) {
-        var s = w(S(), n.tokenRefreshPath ?? "refreshtoken");
+      const r = m.fromFormat(i.value.refreshExpiresOn, c), e = m.fromFormat(i.value.expiresOn, c), t = m.utc().toFormat(c), n = e.plus({ minutes: 0 - D });
+      if (!(t > r.toFormat(c)) && !(t < n.toFormat(c))) {
+        var l = S(k(), u.tokenRefreshPath ?? "refreshtoken");
         try {
-          var a = await fetch(s, {
+          var a = await fetch(l, {
             method: "POST",
             mode: "cors",
             cache: "no-cache",
@@ -155,107 +152,107 @@ function ie(n) {
             body: JSON.stringify({ refreshToken: i.value.refreshToken })
           });
           if (a.ok) {
-            var l = await a.json();
-            a != null && l.data != null && T(l.data);
+            var s = await a.json();
+            a != null && s.data != null && T(s.data);
           }
         } catch {
         }
       }
-    }), await n.tryRefreshToken(i.value);
+    }), await u.tryRefreshToken(i.value);
   }
-  async function $() {
-    return n.testToken ?? (n.testToken = async () => {
-      let e = i.value.token, r = !1;
-      const t = n.getTokenTestUrl ?? (() => w(S(), "test"));
-      return e != null && (await C().post({
-        additionalUrl: t(e),
+  async function M() {
+    return u.testToken ?? (u.testToken = async () => {
+      let r = i.value.token, e = !1;
+      const t = u.getTokenTestUrl ?? (() => S(k(), "test"));
+      return r != null && (await R().post({
+        additionalUrl: t(r),
         data: {
-          token: e
+          token: r
         }
-      })).data === !0 && (r = !0), r ? !0 : (y(n.tokenInvalidPath), !1);
-    }), await n.testToken();
+      })).data === !0 && (e = !0), e ? !0 : (y(u.tokenInvalidPath), !1);
+    }), await u.testToken();
   }
-  async function z(e, r) {
-    return n.getToken ?? (n.getToken = async () => {
-      let t = e, u = r, s = n.oauthGrantType ?? "authorization_token", a = n.oauthClientID ?? "";
-      if (t == null || u == null)
+  async function $(r, e) {
+    return u.getToken ?? (u.getToken = async () => {
+      let t = r, n = e, l = u.oauthGrantType ?? "authorization_token", a = u.oauthClientID ?? "";
+      if (t == null || n == null)
         throw new Error("Code and State required in OAuth token process");
-      if (u != h.value)
+      if (n != h.value)
         throw new Error("state does not match");
-      let l = "";
-      n.getTokenUrl ?? (n.getTokenUrl = () => w(S(), "token")), l = n.getTokenUrl(t, `${window.location.origin}/authentication`, s, a);
+      let s = "";
+      u.getTokenUrl ?? (u.getTokenUrl = () => S(k(), "token")), s = u.getTokenUrl(t, `${window.location.origin}/authentication`, l, a);
       const f = {};
-      f.grant_type = s, f.code = t, f.redirect_uri = `${window.location.origin}/authentication`, f.client_id = a;
-      const q = await C().post({
-        additionalUrl: l,
+      f.grant_type = l, f.code = t, f.redirect_uri = `${window.location.origin}/authentication`, f.client_id = a;
+      const N = await R().post({
+        additionalUrl: s,
         data: f
       });
-      T(q.access_token);
-    }), await n.getToken(e, r);
+      T(N.access_token);
+    }), await u.getToken(r, e);
   }
-  function T(e) {
-    if (e == null)
+  function T(r) {
+    if (r == null)
       return;
-    const r = J(e);
-    W(r, e), n.processTokenPayload != null && n.processTokenPayload(i, r);
+    const e = B(r);
+    z(e, r), u.processTokenPayload != null && u.processTokenPayload(i, e);
   }
-  function W(e, r) {
-    var u;
+  function z(r, e) {
+    var n;
     const t = i.value;
-    t.expiresOn = e.ExpiresOn, t.isGlobalAdmin = e.IsGlobalAdmin == "True", t.isLoggedIn = !0, t.permissions = e.Permissions, t.subscriptionCode = e.Subscription, t.refreshExpiresOn = e.RefreshTokenExpiresOn, t.refreshToken = e.RefreshToken, (n == null ? void 0 : n.menu) != null && (n.menu.currentView.value = t.subscriptionCode), t.timeZone ?? (t.timeZone = n.defaultTimeZone ?? I), t.token = r, t.userID = e.UserLoginID, t.userPermissions = e.Permissions != null && e.Permissions.length > 0 ? ((u = e.Permissions) == null ? void 0 : u.split(",")) ?? [] : [];
+    t.expiresOn = r.ExpiresOn, t.isGlobalAdmin = r.IsGlobalAdmin == "True", t.isLoggedIn = !0, t.permissions = r.Permissions, t.subscriptionCode = r.Subscription, t.refreshExpiresOn = r.RefreshTokenExpiresOn, t.refreshToken = r.RefreshToken, (u == null ? void 0 : u.menu) != null && (u.menu.currentView.value = t.subscriptionCode), t.timeZone ?? (t.timeZone = u.defaultTimeZone ?? b), t.token = e, t.userID = r.UserLoginID, t.userPermissions = r.Permissions != null && r.Permissions.length > 0 ? ((n = r.Permissions) == null ? void 0 : n.split(",")) ?? [] : [];
   }
-  function A() {
-    var e;
-    i.value ?? (i.value = {}), (e = i.value).timeZone ?? (e.timeZone = n.defaultTimeZone ?? I);
+  function P() {
+    var r;
+    i.value ?? (i.value = {}), (r = i.value).timeZone ?? (r.timeZone = u.defaultTimeZone ?? b);
   }
-  function N(e, r) {
+  function W(r, e) {
     const t = o(i);
-    if (t.isLoggedIn && b() && U()) {
+    if (t.isLoggedIn && A() && U()) {
       y();
-      let u = k(e);
-      r != null && (u.includes("?") || (u = u + "?"), u.includes("&") && (u = u + "&"), u = u + new URLSearchParams(r).toString()), window.location.href = u;
+      let n = w(r);
+      e != null && (n.includes("?") || (n = n + "?"), n.includes("&") && (n = n + "&"), n = n + new URLSearchParams(e).toString()), window.location.href = n;
     }
     return t.isLoggedIn;
   }
   function U() {
-    if (!n.useTokenRefresh || v(i.value.refreshExpiresOn) || v(i.value.refreshToken))
+    if (!u.useTokenRefresh || v(i.value.refreshExpiresOn) || v(i.value.refreshToken))
       return !0;
-    const e = m.fromFormat(i.value.refreshExpiresOn, c);
-    return m.utc() > e;
+    const r = m.fromFormat(i.value.refreshExpiresOn, c);
+    return m.utc() > r;
   }
-  function b() {
-    const e = o(i);
-    if (e == null || e.expiresOn == null)
+  function A() {
+    const r = o(i);
+    if (r == null || r.expiresOn == null)
       return !0;
-    const r = m.fromFormat(e.expiresOn, c), t = m.utc();
-    return r <= t;
+    const e = m.fromFormat(r.expiresOn, c), t = m.utc();
+    return e <= t;
   }
-  return A(), O = {
+  return P(), I = {
     authState: h,
     canEdit: F,
     canEditPermit: d,
     canView: _,
     canViewPermit: g,
     credentials: i,
-    doShow: E,
+    doShow: x,
     doShowByNav: p,
-    getAuthorizeUrl: k,
-    getToken: z,
+    getAuthorizeUrl: w,
+    getToken: $,
     isLoggedIn: L(() => i.value.isLoggedIn === !0),
-    login: G,
+    login: Z,
     logout: y,
-    logoutAsync: Z,
+    // logoutAsync,
     refreshTokenExpired: U,
-    resetAuthState: x,
+    resetAuthState: O,
     setAuth: T,
-    testToken: $,
-    timeZone: L(() => i.value.timeZone ?? n.defaultTimeZone ?? I),
-    tokenExpired: b,
-    tryLogin: N,
-    tryRefreshToken: M
-  }, O;
+    testToken: M,
+    timeZone: L(() => i.value.timeZone ?? u.defaultTimeZone ?? b),
+    tokenExpired: A,
+    tryLogin: W,
+    tryRefreshToken: G
+  }, I;
 }
 export {
-  ie as createAuth,
-  ue as useAuth
+  ue as createAuth,
+  ne as useAuth
 };

package/dist/composables/firebase.mjs

@@ -1,30 +1,35 @@
-import { ref as b } from "vue";
+import { shallowRef as v, ref as b } from "vue";
 import { useActions as w } from "./actions.mjs";
 import { appendUrl as u } from "./helpers.mjs";
 import { useDataUrl as d } from "./urls.mjs";
 import "../bt-core/core/node_modules/firebase/app/dist/esm/index.esm.mjs";
-import { getMessaging as v, onRegistered as R, onUnregistered as F, onMessage as h, register as L, unregister as k } from "../bt-core/core/node_modules/@firebase/messaging/dist/esm/index.esm.mjs";
+import { getMessaging as R, onRegistered as h, onUnregistered as F, onMessage as L, register as M, unregister as k } from "../bt-core/core/node_modules/@firebase/messaging/dist/esm/index.esm.mjs";
 import { getDetailedDeviceType as m } from "./devices.mjs";
 import { initializeApp as D } from "../bt-core/core/node_modules/@firebase/app/dist/esm/index.esm.mjs";
 let t, g;
-function P(e) {
+function S(e) {
   g = e;
 }
-function S() {
-  return t;
+function p() {
+  const e = v(void 0);
+  return t ?? {
+    actionLoadingMsg: e,
+    register: () => Promise.resolve(),
+    unregister: () => Promise.resolve()
+  };
 }
-function p(e) {
+function q(e) {
   if (t != null)
     return t;
   const { actionLoadingMsg: y, apiPost: l } = w();
   var a = "", n = "";
   (e == null ? void 0 : e.finalRegisterURL) != null ? a = e.finalRegisterURL : a = u(d(), (e == null ? void 0 : e.registerUrl) ?? "FirebaseNotifications/Register"), (e == null ? void 0 : e.finalUnregisterURL) != null ? n = e.finalUnregisterURL : n = u(d(), (e == null ? void 0 : e.unregisterURL) ?? "FirebaseNotifications/Unregister");
-  const c = D(e.config), i = v(c), o = b(typeof window < "u" && "Notification" in window ? Notification.permission : "default");
+  const o = D(e.config), i = R(o), c = b(typeof window < "u" && "Notification" in window ? Notification.permission : "default");
   async function f() {
-    if (o.value === "granted")
+    if (c.value === "granted")
       try {
         const r = await navigator.serviceWorker.ready;
-        await L(
+        await M(
           i,
           {
             vapidKey: e.vapidPublicKey,
@@ -42,7 +47,7 @@ function p(e) {
       throw console.log("Error calling firebase unregister:", r), r;
     }
   }
-  return R(i, async (r) => {
+  return h(i, async (r) => {
     console.log("Firebase Installation ID received:", r);
     try {
       await l({
@@ -70,19 +75,19 @@ function p(e) {
     } catch (s) {
       console.log("firebase backend unregister notification error", s);
     }
-  }), h(i, (r) => {
+  }), L(i, (r) => {
     g != null && g(r);
   }), t == null && e.initiateImmediately && f(), t ?? (t = {
     actionLoadingMsg: y,
-    app: c,
+    app: o,
     messaging: i,
-    permission: o,
+    permission: c,
     register: f,
     unregister: U
   }), t;
 }
 export {
-  p as createFirebase,
-  S as useFirebase,
-  P as useFirebaseListener
+  q as createFirebase,
+  p as useFirebase,
+  S as useFirebaseListener
 };