@opengis/admin 0.3.107 → 0.3.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.107",
+  "version": "0.3.110",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -48,7 +48,7 @@
     "@fullcalendar/vue3": "^6.1.15",
     "@opengis/fastify-auth": "1.0.86",
     "@opengis/fastify-file": "1.0.83",
-    "@opengis/fastify-table": "^1.3.52",
+    "@opengis/fastify-table": "1.3.65",
     "@opengis/v3-core": "^0.3.161",
     "@opengis/v3-filter": "^0.1.3",
     "@tiptap/core": "^2.8.0",

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

@@ -45,7 +45,7 @@ export default async function accessGroupPost({
 
     const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
     insert into admin.user_roles(role_id,user_uid,access_granted)
-    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
+    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${user?.uid?.replace(/'/g, "''")}')`)}`;
 
     await pg.query(q);
 

package/server/routes/data/controllers/cardData.js

@@ -11,29 +11,33 @@ const components = {
     'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
 };
 
-export default async function getCardData(req) {
+export default async function getCardData(req, reply) {
 
     const {
-        pg, params = {}, session = {}, user
+        pg, params = {}, session = {}, user = {},
     } = req;
     const { table, id } = params;
-    const uid = session.passport?.user?.uid;
+    const { uid } = user;
 
     const res = await applyHook('cardData', { table, id, user });
     if (res) return res;
 
-
     const time = Date.now();
 
     const template = await getTemplate('card', table);
-    const access = await getAccess({ table, user });
+    const access = await getAccess({ table, user }, pg);
+
+    if (!access?.actions?.length) {
+        return reply.status(403).send('access restricted');
+    }
 
     const tableTemplate = await getTemplate('table', table);
 
     const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
 
-    const { message, rows = [] } = index.table && index.query ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`) :
-        await getTableData({ pg, params: { table, id }, session, user });
+    const { message, rows = [] } = index.table && index.query
+        ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`)
+        : await getTableData({ pg, params: { table, id }, session, user });
 
     if (message) return { message };
 
@@ -70,14 +74,14 @@ export default async function getCardData(req) {
             .forEach(key => {
                 const item = index?.tokens[key];
                 Object.keys(item).filter(el => item[el]?.includes?.('{{')).forEach(el => {
-                    item[el] = handlebarsSync.compile(item[el])({ user, uid: user?.uid, id, data: rows[0] });
+                    item[el] = handlebarsSync.compile(item[el])({ user, uid, id, data: rows[0] });
                 });
 
                 const token = item.form && item.table ? setToken({
                     ids: [JSON.stringify(item)],
                     uid,
                     array: 1,
-                })[0] : setOpt(item, user.uid);
+                })[0] : setOpt(item, uid);
                 tokens[key] = token;
             });
     }
@@ -93,7 +97,7 @@ export default async function getCardData(req) {
     Object.assign(route, { tableTitle: tableTemplate?.title });
     if (index?.data && index?.data?.[0]?.name) {
         await Promise.all(index.data.filter((el) => el?.name && el?.sql).map(async (el) => {
-            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid: user?.uid, id });
+            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid, id });
             const { rows: sqlData } = await pg.query(q);
             data[el.name] = sqlData;
         }));