@opengis/fastify-table 2.0.52 → 2.0.54

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/routes/access/controllers/access.group.post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GAiFpB"}
+{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GA4FpB"}

package/dist/server/routes/access/controllers/access.group.post.js

@@ -21,12 +21,14 @@ export default async function accessGroupPost({ pg = pgClients.client, params, u
     if (routes?.length) {
         const routesDB = await pg
             .query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
-            .then((res1) => res1.rows?.[0]?.routesDB || []);
+            .then((el) => el.rows?.[0]?.routesDB || []);
         await pg.query("delete from admin.role_access where role_id=$1;", [id]);
-        const q = "insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)";
         await Promise.all(routes
-            .filter((el) => routesDB?.includes?.(el.path) && el.actions)
-            .map((el) => pg.query(q, [id, el.path, el.actions])));
+            .filter((el) => !routesDB?.includes(el.path))
+            .map((el) => pg.query("insert into admin.routes(route_id) values($1)", [el.path])));
+        await Promise.all(routes
+            .filter((el) => /*routesDB?.includes?.(el.path) && */ el.actions)
+            .map((el) => pg.query("insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)", [id, el.path, el.actions])));
         const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
             left join admin.role_access b on a.route_id=b.route_id
             where b.role_id=$1`, [id]);

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.52",
+  "version": "2.0.54",
   "type": "module",
   "description": "core-plugins",
   "keywords": [