@opengis/fastify-table 2.0.51 → 2.0.53

package/dist/server/migrations/0.sql

@@ -82,3 +82,19 @@ else
 end if;
 
 end $$
+
+CREATE OR REPLACE FUNCTION array_intersect(
+	anyarray,
+	anyarray)
+    RETURNS anyarray
+    LANGUAGE 'sql'
+    COST 100
+    VOLATILE PARALLEL UNSAFE
+AS $BODY$
+
+    SELECT ARRAY(
+        SELECT UNNEST($1)
+        INTERSECT
+        SELECT UNNEST($2)
+    );
+$BODY$;

package/dist/server/plugins/table/funcs/getSelect.d.ts

@@ -1,2 +1,2 @@
-export default function getSelect(name: any, pg?: any): Promise<any>;
+export default function getSelect(name: any, pg?: any, nocache?: boolean): Promise<any>;
 //# sourceMappingURL=getSelect.d.ts.map

package/dist/server/plugins/table/funcs/getSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAmB,gBA6BvE"}
+{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CACrC,IAAI,EAAE,GAAG,EACT,EAAE,MAAmB,EACrB,OAAO,UAAQ,gBAgChB"}

package/dist/server/plugins/table/funcs/getSelect.js

@@ -7,9 +7,10 @@ const sqls = {
     json: `select json_agg(json_build_object('id', code, 'text', name, 'icon', icon, 'color', color)) as data from admin.user_cls where parent=$1
   union all select json_agg(json_build_object('id', code, 'text', name, 'icon', icon, 'color', color)) as data from admin.cls where parent=$1`,
 };
-export default async function getSelect(name, pg = pgClients.client) {
-    if (loadCls[name] && !config.local)
+export default async function getSelect(name, pg = pgClients.client, nocache = false) {
+    if (loadCls[name] && !config.local && !nocache) {
         return loadCls[name];
+    }
     const clsDataGIT = await getTemplate(["cls", "select"], name);
     const { type } = pg.pk?.["admin.user_cls"]
         ? await pg

package/dist/server/plugins/table/funcs/getSelectMeta.js

@@ -8,7 +8,7 @@ const selectMeta = {};
 export default async function getSelectMeta({ name, pg = pgClients.client, nocache, parent, }) {
     if (selectMeta[name] && !nocache)
         return selectMeta[name];
-    const cls = await getSelect(name, pg);
+    const cls = await getSelect(name, pg, nocache);
     const db = typeof cls?.db === "string" ? { database: cls.db } : cls?.db;
     const pg1 = cls?.db ? getPG(db) : pg;
     if (!pg1?.pk)

package/dist/server/routes/auth/controllers/core/getUserInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAMA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eAgDjD"}
+{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAiCA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eAyDjD"}

package/dist/server/routes/auth/controllers/core/getUserInfo.js

@@ -2,6 +2,32 @@ import config from "../../../../../config.js";
 import { applyHook } from "../../../../../utils.js";
 import getRedis from "../../../../plugins/redis/funcs/getRedis.js";
 const rclient2 = getRedis({ db: 2 });
+const q = `select
+
+  a.route_id as id, 
+  /* coalesce(d.actions, array['view', 'edit','add','del']) as role_actions,
+  coalesce(b.actions, array['view']) as interface_actions, */
+  array_intersect(coalesce(b.actions, array['view']), coalesce(d.actions, array['view', 'edit','add','del'])) as actions,
+  b.scope,
+  c.role_id,
+  c.name as role_name
+
+from admin.routes a 
+left join admin.role_access b on 
+  a.route_id=b.route_id
+left join admin.roles c on 
+  b.role_id=c.role_id 
+  and c.enabled
+left join admin.user_roles d on 
+  c.role_id=d.role_id
+  and (
+    case when
+      d.expiration is not null 
+      then d.expiration > CURRENT_DATE 
+      else 1=1 
+    end
+  )
+where $1 in (b.user_uid, d.user_uid)`;
 export default async function getUserInfo(req) {
     const payload = {
         sessionID: req.session?.sessionId,
@@ -25,12 +51,19 @@ export default async function getUserInfo(req) {
         p[k1][k2] = val;
         return p;
     }, {});
+    const access = req.pg?.pk?.["admin.role_access"] &&
+        req.pg?.pk?.["admin.user_roles"] &&
+        req.pg?.pk?.["admin.users"] &&
+        req.user?.uid
+        ? await req.pg.query(q, [req.user.uid]).then((el) => el.rows || [])
+        : [];
     Object.assign(payload, {
         user: userInfo,
         settings,
         session: !config.auth?.debug
             ? { ...req.session, passport: null }
             : req.session,
+        access,
     });
     const hookData = await applyHook("afterUser", { payload });
     return hookData || payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.51",
+  "version": "2.0.53",
   "type": "module",
   "description": "core-plugins",
   "keywords": [