web-mojo 2.1.153 → 2.1.155

package/dist/index.es.js

@@ -1,14 +1,14 @@
-import { V as View, W as WebApp, d as dataFormatter, M as Mustache } from "./chunks/WebApp-DgjEViGQ.js";
-import { B, D, g, E, h, r, R, b, a, c, e, f } from "./chunks/WebApp-DgjEViGQ.js";
-import { P as Page } from "./chunks/Page-CdPnQkJX.js";
-import { G as GroupList, T as ToastService, U as User, a as Group } from "./chunks/User-E_SqtRtc.js";
-import { C, b as b2, M, e as e2, f as f2, g as g2, h as h2, i, d, c as c2 } from "./chunks/User-E_SqtRtc.js";
-import { E as E2, i as i2, h as h3, o, q, p, u, w, v, r as r2, t, s, F, e as e3, am, an, z, I, y, x, B as B2, J, K, A, G, H, C as C2, D as D2, U, V, _, $, X, W, Y, Z, a1, a3, a2, a0, L, c as c3, a4, a5, M as M2, k, j, a6, a8, a7, ab, a9, aa, P, ag, ak, ah, ai, aj, ac, ad, ae, al, af, O, Q, R as R2, N, S, g as g3, f as f3, l, n, m, d as d2, b as b3, a as a10, T, ao, as, ap, aq, ar } from "./chunks/FilePreviewView-vZQ_R6L4.js";
-import { T as TopNav } from "./chunks/TopNav-BvPqMucG.js";
-import { T as TokenManager } from "./chunks/TokenManager-BXNva8Jk.js";
-import Dialog from "./chunks/Dialog-D5es1Gad.js";
-import { default as default2 } from "./chunks/DataView-Dxv-vfX1.js";
-import { F as F2, a as a11 } from "./chunks/FormView-CV-j8reS.js";
+import { V as View, W as WebApp, d as dataFormatter, M as Mustache } from "./chunks/WebApp-B4BbKCzq.js";
+import { B, D, g, E, h, r, R, b, a, c, e, f } from "./chunks/WebApp-B4BbKCzq.js";
+import { P as Page } from "./chunks/Page-BIFnANh8.js";
+import { G as GroupList, T as ToastService, U as User, a as Group } from "./chunks/User-CsfPb7v8.js";
+import { C, b as b2, M, e as e2, f as f2, g as g2, h as h2, i, d, c as c2 } from "./chunks/User-CsfPb7v8.js";
+import { E as E2, i as i2, h as h3, o, q, p, u, w, v, r as r2, t, s, F, e as e3, am, an, z, I, y, x, B as B2, J, K, A, G, H, C as C2, D as D2, U, V, _, $, X, W, Y, Z, a1, a3, a2, a0, L, c as c3, a4, a5, M as M2, k, j, a6, a8, a7, ab, a9, aa, P, ag, ak, ah, ai, aj, ac, ad, ae, al, af, O, Q, R as R2, N, S, g as g3, f as f3, l, n, m, d as d2, b as b3, a as a10, T, ao, as, ap, aq, ar } from "./chunks/FilePreviewView-_FlzNVa5.js";
+import { T as TopNav } from "./chunks/TopNav-BBQq3REa.js";
+import { T as TokenManager } from "./chunks/TokenManager-5HHjYzTo.js";
+import Dialog from "./chunks/Dialog-BIw4iz3W.js";
+import { default as default2 } from "./chunks/DataView-BPogz9nU.js";
+import { F as F2, a as a11 } from "./chunks/FormView-Bt15WWg9.js";
 import { W as W2 } from "./chunks/WebSocketClient-Dvl3AYx1.js";
 class ResultsView extends View {
   constructor(options = {}) {
@@ -1856,6 +1856,10 @@ class PortalApp extends WebApp {
       this.setActiveUser(null);
       return;
     });
+    this.events.on("browser:focus", () => {
+      if (!this.activeUser) return;
+      this.tokenManager.checkAndRefreshTokens(this);
+    });
     this.events.on("portal:action", this.onPortalAction.bind(this));
     if (this.activeUser) {
       await this.checkActiveGroup();
@@ -1867,19 +1871,22 @@ class PortalApp extends WebApp {
     console.log(`${this.title} portal ready`);
   }
   async checkAuthStatus() {
-    const token = this.tokenManager.getTokenInstance();
-    if (!token || !token.isValid()) {
+    const tokenStatus = this.tokenManager.checkTokenStatus();
+    if (tokenStatus.action === "logout") {
       this.events.emit("auth:unauthorized", { app: this });
       return false;
     }
-    if (token.isExpired()) {
-      this.events.emit("auth:unauthorized", { app: this });
-      return false;
+    if (tokenStatus.action === "refresh") {
+      const refreshed = await this.tokenManager.checkAndRefreshTokens(this);
+      if (!refreshed) {
+        return false;
+      }
     }
-    if (token.isExpiringSoon()) {
-      this.events.emit("auth:expiring", { app: this });
+    const token = this.tokenManager.getTokenInstance();
+    if (this.activeUser) {
+      this.tokenManager.startAutoRefresh(this);
+      return true;
     }
-    if (this.activeUser) return true;
     this.rest.setAuthToken(token.token);
     const user = new User({ id: token.getUserId() });
     const resp = await user.fetch();