@objectstack/rest 10.2.0 → 11.0.0

package/dist/index.d.cts

@@ -344,6 +344,19 @@ declare class RestServer {
      * is never mutated so cached metadata stays clean.
      */
     private filterAppForUser;
+    /**
+     * ADR-0057 D10 (dashboards): strip dashboard widgets whose `requiresService`
+     * capability gate names a kernel service that isn't registered — the same
+     * "server is the authoritative visibility gate" rule already applied to app
+     * nav entries (see {@link filterAppForUser}). Without this, a widget bound to
+     * an optional service renders a dead tile in deployments where the service is
+     * off (e.g. the Organizations KPI under multi-tenant `org-scoping`, which is
+     * absent in a single-tenant runtime while its nav entry is correctly hidden).
+     *
+     * Fail-open when the gate can't be probed (serviceGate undefined). Never
+     * mutates the original — returns a shallow copy only when a widget is dropped.
+     */
+    private filterDashboardForUser;
     /**
      * Probe which `requiresService` capability gates referenced anywhere in
      * `items` are actually registered in the runtime kernel. Returns `null`

package/dist/index.d.ts

@@ -344,6 +344,19 @@ declare class RestServer {
      * is never mutated so cached metadata stays clean.
      */
     private filterAppForUser;
+    /**
+     * ADR-0057 D10 (dashboards): strip dashboard widgets whose `requiresService`
+     * capability gate names a kernel service that isn't registered — the same
+     * "server is the authoritative visibility gate" rule already applied to app
+     * nav entries (see {@link filterAppForUser}). Without this, a widget bound to
+     * an optional service renders a dead tile in deployments where the service is
+     * off (e.g. the Organizations KPI under multi-tenant `org-scoping`, which is
+     * absent in a single-tenant runtime while its nav entry is correctly hidden).
+     *
+     * Fail-open when the gate can't be probed (serviceGate undefined). Never
+     * mutates the original — returns a shallow copy only when a widget is dropped.
+     */
+    private filterDashboardForUser;
     /**
      * Probe which `requiresService` capability gates referenced anywhere in
      * `items` are actually registered in the runtime kernel. Returns `null`

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/rest-server.ts
-import { resolveApiKeyPrincipal } from "@objectstack/core";
+import { resolveAuthzContext, resolveLocalizationContext } from "@objectstack/core";
 
 // src/route-manager.ts
 var RouteManager = class {
@@ -762,155 +762,36 @@ var RestServer = class {
       } else {
         return void 0;
       }
-      const permissions = [];
-      const systemPermissions = [];
-      const roles = [];
-      let identityQl;
-      if (kernel) identityQl = await kernel.getServiceAsync("objectql").catch(() => void 0);
-      if (!identityQl && this.objectQLProvider) {
-        identityQl = await this.objectQLProvider(environmentId).catch(() => void 0);
-      }
-      let userId;
-      let tenantId;
-      let email;
-      const keyPrincipal = await resolveApiKeyPrincipal(identityQl, headers).catch(() => void 0);
-      if (keyPrincipal) {
-        userId = keyPrincipal.userId;
-        tenantId = keyPrincipal.tenantId;
-        for (const s of keyPrincipal.scopes) if (!permissions.includes(s)) permissions.push(s);
-      } else {
-        const session = await api.getSession({ headers });
-        if (!session?.user?.id) return void 0;
-        userId = session.user.id;
-        tenantId = session.session?.activeOrganizationId ?? void 0;
-        if (session.user?.email) email = String(session.user.email);
-      }
-      if (!email && identityQl && typeof identityQl.find === "function") {
-        const urows = await identityQl.find("sys_user", { where: { id: userId }, limit: 1, context: { isSystem: true } }).catch(() => []);
-        if (urows?.[0]?.email) email = String(urows[0].email);
-      }
-      try {
-        let ql;
-        if (kernel) {
-          ql = await kernel.getServiceAsync("objectql").catch(() => void 0);
-        }
-        if (!ql && this.objectQLProvider) {
-          ql = await this.objectQLProvider(environmentId).catch(() => void 0);
-        }
-        if (ql && typeof ql.find === "function") {
-          const sysOpts = { context: { isSystem: true } };
-          const memberRows = await ql.find("sys_member", {
-            where: tenantId ? { user_id: userId, organization_id: tenantId } : { user_id: userId },
-            limit: 50,
-            ...sysOpts
-          }).catch(() => []);
-          for (const m of memberRows ?? []) {
-            if (typeof m.role === "string") {
-              for (const r of m.role.split(",").map((s) => s.trim()).filter(Boolean)) {
-                if (!roles.includes(r)) roles.push(r);
-              }
-            }
-          }
-          const upsRows = await ql.find("sys_user_permission_set", {
-            where: { user_id: userId },
-            limit: 100,
-            ...sysOpts
-          }).catch(() => []);
-          const psIds = /* @__PURE__ */ new Set();
-          for (const r of upsRows ?? []) {
-            const orgScope = r.organization_id ?? null;
-            if (!orgScope || tenantId && orgScope === tenantId) {
-              const pid = r.permission_set_id ?? r.permissionSetId;
-              if (pid) psIds.add(pid);
-            }
-          }
-          if (psIds.size > 0) {
-            const psRows = await ql.find("sys_permission_set", {
-              where: { id: { $in: Array.from(psIds) } },
-              limit: 500,
-              ...sysOpts
-            }).catch(() => []);
-            for (const ps of psRows ?? []) {
-              if (ps.name && !permissions.includes(ps.name)) permissions.push(ps.name);
-              const rawSys = typeof ps.system_permissions === "string" ? (() => {
-                try {
-                  return JSON.parse(ps.system_permissions);
-                } catch {
-                  return [];
-                }
-              })() : ps.system_permissions ?? ps.systemPermissions;
-              if (Array.isArray(rawSys)) {
-                for (const sp of rawSys) {
-                  if (typeof sp === "string" && !systemPermissions.includes(sp)) {
-                    systemPermissions.push(sp);
-                  }
-                }
-              }
-            }
-          }
-        }
-      } catch {
-      }
-      let org_user_ids = [userId];
-      if (tenantId) {
+      const ql = kernel ? await kernel.getServiceAsync("objectql").catch(() => void 0) : this.objectQLProvider ? await this.objectQLProvider(environmentId).catch(() => void 0) : void 0;
+      const getSession = async (h) => {
         try {
-          let ql;
-          if (kernel) {
-            ql = await kernel.getServiceAsync("objectql").catch(() => void 0);
-          }
-          if (!ql && this.objectQLProvider) {
-            ql = await this.objectQLProvider(environmentId).catch(() => void 0);
-          }
-          if (ql && typeof ql.find === "function") {
-            const sysOpts = { context: { isSystem: true } };
-            const memberRows = await ql.find("sys_member", {
-              where: { organization_id: tenantId },
-              limit: 1e3,
-              ...sysOpts
-            }).catch(() => []);
-            const ids = /* @__PURE__ */ new Set([userId]);
-            for (const m of memberRows ?? []) {
-              const uid = m.user_id ?? m.userId;
-              if (typeof uid === "string" && uid.length > 0) ids.add(uid);
-            }
-            org_user_ids = Array.from(ids);
-          }
+          return await api.getSession({ headers: h });
         } catch {
+          return void 0;
         }
-      }
-      let timezone;
-      let locale;
-      let currency;
-      try {
-        const settings = this.settingsServiceProvider ? await this.settingsServiceProvider(environmentId).catch(() => void 0) : void 0;
-        if (settings && typeof settings.get === "function") {
-          const sctx = { tenantId, userId };
-          const [tzRes, localeRes, currencyRes] = await Promise.all([
-            settings.get("localization", "timezone", sctx).catch(() => void 0),
-            settings.get("localization", "locale", sctx).catch(() => void 0),
-            settings.get("localization", "currency", sctx).catch(() => void 0)
-          ]);
-          const tzVal = tzRes?.value;
-          const localeVal = localeRes?.value;
-          const currencyVal = currencyRes?.value;
-          if (typeof tzVal === "string" && tzVal.trim()) timezone = tzVal.trim();
-          if (typeof localeVal === "string" && localeVal.trim()) locale = localeVal.trim();
-          if (typeof currencyVal === "string" && currencyVal.trim()) currency = currencyVal.trim().toUpperCase();
-        }
-      } catch {
-      }
+      };
+      const authz = await resolveAuthzContext({ ql, headers, getSession });
+      if (!authz.userId) return void 0;
+      const settings = this.settingsServiceProvider ? await this.settingsServiceProvider(environmentId).catch(() => void 0) : void 0;
+      const localization = await resolveLocalizationContext({
+        ql,
+        settings,
+        tenantId: authz.tenantId,
+        userId: authz.userId
+      });
       return {
-        userId,
-        tenantId,
-        email,
-        roles,
-        permissions,
-        systemPermissions,
+        userId: authz.userId,
+        tenantId: authz.tenantId,
+        email: authz.email,
+        roles: authz.roles,
+        permissions: authz.permissions,
+        systemPermissions: authz.systemPermissions,
+        ...authz.tabPermissions ? { tabPermissions: authz.tabPermissions } : {},
         isSystem: false,
-        org_user_ids,
-        ...timezone ? { timezone } : {},
-        ...locale ? { locale } : {},
-        ...currency ? { currency } : {},
+        org_user_ids: authz.org_user_ids,
+        ...localization.timezone ? { timezone: localization.timezone } : {},
+        ...localization.locale ? { locale: localization.locale } : {},
+        ...localization.currency ? { currency: localization.currency } : {},
         // Internal: resolved kernel so the nav-serving path can probe
         // requiresService capability gates (ADR-0057 D10). NOT an
         // authorization input — never read by RLS/permission logic.
@@ -970,6 +851,30 @@ var RestServer = class {
     };
     return { ...item, navigation: filterNav(nav) };
   }
+  /**
+   * ADR-0057 D10 (dashboards): strip dashboard widgets whose `requiresService`
+   * capability gate names a kernel service that isn't registered — the same
+   * "server is the authoritative visibility gate" rule already applied to app
+   * nav entries (see {@link filterAppForUser}). Without this, a widget bound to
+   * an optional service renders a dead tile in deployments where the service is
+   * off (e.g. the Organizations KPI under multi-tenant `org-scoping`, which is
+   * absent in a single-tenant runtime while its nav entry is correctly hidden).
+   *
+   * Fail-open when the gate can't be probed (serviceGate undefined). Never
+   * mutates the original — returns a shallow copy only when a widget is dropped.
+   */
+  filterDashboardForUser(item, serviceGate) {
+    if (!item || typeof item !== "object" || !serviceGate) return item;
+    if (isMetaEnvelope(item)) {
+      const body = this.filterDashboardForUser(item.item, serviceGate);
+      return body === item.item ? item : { ...item, item: body };
+    }
+    if (!Array.isArray(item.widgets)) return item;
+    const widgets = item.widgets.filter(
+      (w) => !(w && typeof w.requiresService === "string" && serviceGate(w.requiresService) === false)
+    );
+    return widgets.length === item.widgets.length ? item : { ...item, widgets };
+  }
   /**
    * Probe which `requiresService` capability gates referenced anywhere in
    * `items` are actually registered in the runtime kernel. Returns `null`
@@ -1006,7 +911,7 @@ var RestServer = class {
         return;
       }
       if (typeof e.requiresService === "string") wanted.add(e.requiresService);
-      const kids = Array.isArray(e.navigation) ? e.navigation : Array.isArray(e.children) ? e.children : null;
+      const kids = Array.isArray(e.navigation) ? e.navigation : Array.isArray(e.children) ? e.children : Array.isArray(e.widgets) ? e.widgets : null;
       if (kids) for (const k of kids) walk(k);
     };
     for (const it of items) walk(it);
@@ -1294,10 +1199,10 @@ var RestServer = class {
       this.registerReportsEndpoints(bp);
       this.registerApprovalsEndpoints(bp);
       this.registerAnalyticsEndpoints(bp);
+      this.registerDataActionEndpoints(bp);
       if (this.config.api.enableCrud) {
         this.registerCrudEndpoints(bp);
       }
-      this.registerDataActionEndpoints(bp);
       if (this.config.api.enableBatch) {
         this.registerBatchEndpoints(bp);
       }
@@ -1634,6 +1539,19 @@ var RestServer = class {
                 }
               }
             }
+            if (req.params.type === "dashboard") {
+              const raw = visible;
+              const list = Array.isArray(raw) ? raw : raw && typeof raw === "object" && Array.isArray(raw.items) ? raw.items : null;
+              if (list) {
+                const ctx = await this.resolveExecCtx(environmentId, req).catch(() => void 0);
+                const registered = await this.resolveRegisteredServices(ctx?.__kernel, list);
+                const serviceGate = registered ? (n) => registered.has(n) : void 0;
+                if (serviceGate) {
+                  const filtered = list.map((it) => this.filterDashboardForUser(it, serviceGate));
+                  visible = Array.isArray(raw) ? filtered : { ...raw, items: filtered };
+                }
+              }
+            }
             if (req.params.type === "view" && req.query?.object) {
               const obj = String(req.query.object);
               const raw = visible;
@@ -1806,9 +1724,11 @@ var RestServer = class {
                 res.header("Last-Modified", new Date(result.lastModified).toUTCString());
               }
               if (result.cacheControl) {
-                const directives = result.cacheControl.directives.join(", ");
-                const maxAge = result.cacheControl.maxAge ? `, max-age=${result.cacheControl.maxAge}` : "";
-                res.header("Cache-Control", directives + maxAge);
+                const parts = result.cacheControl.directives.filter((d) => d !== "max-age");
+                if (result.cacheControl.maxAge != null) {
+                  parts.push(`max-age=${result.cacheControl.maxAge}`);
+                }
+                res.header("Cache-Control", parts.join(", "));
               }
               res.header("Vary", "Accept-Language");
               res.json(await this.translateMetaItem(req, req.params.type, environmentId, result.data, cacheI18n));
@@ -1841,6 +1761,12 @@ var RestServer = class {
                   }
                 }
               }
+              if (req.params.type === "dashboard" && visible) {
+                const ctx = await this.resolveExecCtx(environmentId, req).catch(() => void 0);
+                const registered = await this.resolveRegisteredServices(ctx?.__kernel, [visible]);
+                const serviceGate = registered ? (n) => registered.has(n) : void 0;
+                if (serviceGate) visible = this.filterDashboardForUser(visible, serviceGate);
+              }
               if (req.params.type === "doc" && visible) {
                 const locale = this.extractLocale(req);
                 const { resolveDocLocale } = await import("@objectstack/spec/system");
@@ -2969,7 +2895,7 @@ var RestServer = class {
             const allow = (name, cfg) => {
               const def = objectSchema?.fields?.[name];
               const t = def?.type;
-              if (t !== "lookup" && t !== "master_detail") return true;
+              if (t !== "lookup" && t !== "master_detail" && t !== "user") return true;
               return !!cfg?.publicPicker;
             };
             const sections = match.form.sections.map((sec) => {