@opengis/fastify-table 1.1.47 → 1.1.48

package/crud/controllers/insert.js

@@ -11,16 +11,14 @@ export default async function insert(req) {
     return { message: hookData?.message, status: hookData?.status };
   }
   const tokenData = await getToken({
-    uid: user.uid, token: params.table, mode: 'w', json: 1,
+    uid: user.uid, token: params.table, mode: 'a', json: 1,
   });
-  // console.log(tokenData);
+
   const { form, table: add } = hookData || tokenData || (config.auth?.disable ? req.params : {});
 
   const { actions = [] } = await getAccess({ table: add, user }) || {};
 
-  if (!actions.includes('add')) {
-    return { message: 'access restricted', status: 403 };
-  }
+  if (!actions.includes('add')) return { message: 'access restricted', status: 403 };
 
   if (!add) {
     return { message: 'table is required', status: 400 };

package/crud/funcs/getAccess.js

@@ -29,30 +29,15 @@ export default async function getAccess({ table, user = {} }) {
   const { uid } = user;
   const body = await getTemplate('table', table) || {};
 
-  if (config.auth?.disable || user?.user_type?.includes('admin') || body?.public) {
+  if (config.auth?.disable || user?.user_type?.includes('admin') || body?.public || body.access === 'public' || (body.access === 'user' && user.uid)) {
     return { actions: ['get'].concat(body.actions || body.action_default || []), query: '1=1' };
   }
 
   if (!uid || !body?.table) return null;
 
-  const { scope = 'my', actions = [] } = await pgClients.client.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
-
-  /* const { columns = [] } = await getMeta({ table: body?.table });
-
-  const query = userType?.includes('admin') ? '1=1' : {
-    my: `uid='${uid}'`,
-    responsible: columns.map((el) => el?.name || el).includes('responsible_id')
-      ? `responsible_id='${uid}'`
-      : `uid='${uid}'`,
-    all: '1=1',
-  }[scope];
-
-  const { my } = pg.pk?.[body?.table] && id
-    ? await pg.query(`select uid=$1 as my from ${body?.table} where ${pg.pk?.[body?.table]}=$2`, [uid, id])
-      .then((res) => res.rows?.[0] || {})
-    : {}; */
+  const { scope, actions = [] } = await pgClients.client.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
 
   return {
-    scope, actions,
+    scope, actions, query: scope === 'my' ? `uid='${uid}` : null,
   };
 }

package/crud/funcs/setToken.js

@@ -16,7 +16,7 @@ const generateCodes = (ids, userToken) => {
 };
 
 function setToken({
-  ids: idsOrigin, mode = 'r', uid, referer, array,
+  ids: idsOrigin, mode = 'r', uid, array,
 }) {
   const rclient2 = getRedis({ db: 0 });
   //  const rclient5 = getRedis({ db: 0, funcs });
@@ -37,7 +37,7 @@ function setToken({
   rclient2.hmset(`${config.pg.database}:token:${{
     e: 'exec', r: 'view', w: 'edit', a: 'add',
   }[mode]}:${uid}`, codes);
-
+  // console.log(codes);
   // log token for debug. add extra data - uid, mode, date
   /* const dt = new Date().toISOString();
    const codesLog = Object.keys(codes).reduce((acc, key) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.47",
+  "version": "1.1.48",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -15,6 +15,7 @@
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "^5.4.0",
     "@opengis/fastify-hb": "^1.4.2",
+    "@opengis/fastify-table": "^1.1.47",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
@@ -25,16 +26,16 @@
   },
   "devDependencies": {
     "@panzoom/panzoom": "^4.5.1",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
     "markdown-it-abbr": "^2.0.0",
-    "mermaid": "10.9.1",
+    "mermaid": "^10.9.3",
     "sass": "1.72.0",
     "vitepress": "^1.3.4",
     "vitepress-plugin-mermaid": "^2.0.16",
     "vitepress-plugin-tabs": "^0.5.0",
     "vitepress-sidebar": "^1.25.0",
-    "vue": "^3.4.27",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4"
+    "vue": "^3.4.27"
   },
   "author": "Softpro",
   "license": "ISC"

package/table/controllers/data.js

@@ -97,7 +97,8 @@ export default async function dataAPI(req) {
                      ${cardColumns} 
                      from ${table} t ${sqlTable} ${cardSqlTable} 
                      where ${where.join(' and ') || 'true'} 
-                     ${order} ${offset}  limit ${limit}`;
+                     ${order} ${offset}  limit ${limit}`
+    .replace(/{{uid}}/g, user.uid);
 
   if (query.sql === '1') { return q; }
 
@@ -105,20 +106,27 @@ export default async function dataAPI(req) {
 
   const filterWhere = [fData.q, search, bbox, queryPolyline].filter((el) => el);
 
+  const qCount = `select 
+            count(*)::int as total,  
+            count(*) FILTER(WHERE ${filterWhere.filter(el => el).join(' and ') || 'true'})::int as filtered 
+            from ${table} t ${sqlTable} 
+            where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
+    .replace(/{{uid}}/g, user.uid);
+
   const { total, filtered } = keyQuery || hookData?.id || params.id ? rows.length
-    : await pg.queryCache(`select count(*)::int as total, count(*) FILTER(WHERE ${filterWhere.filter(el => el).join(' and ') || 'true'})::int as filtered 
-    from ${table} t ${sqlTable} where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'}`).then((el) => el?.rows[0]);
+    : await pg.queryCache(qCount).then((el) => el?.rows[0]);
 
   await metaFormat({ rows, table: params.table });
   const res = {
     time: Date.now() - time, public: ispublic, card: loadTable.card, actions: loadTable.actions, total, filtered, count: rows.length, pk, form, rows, meta, columns, filters,
   };
 
-  if (!config?.security?.disableToken || (user.uid && actions.includes('edit'))) {
+  // console.log({ add: loadTable.table, form: loadTable.form });
+  if (user.uid && actions.includes('add')) {
     const addTokens = setToken({
-      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
+      ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
       mode: 'a',
-      uid: config?.auth?.disable ? '1' : uid,
+      uid,
       array: 1,
     });
     Object.assign(res, { addToken: addTokens[0] });