@opengis/fastify-table 1.1.115 → 1.1.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.115",
+  "version": "1.1.116",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/plugins/crud/funcs/getAccess.js

@@ -1,6 +1,4 @@
-import config from '../../../../config.js';
 import pgClients from '../../pg/pgClients.js';
-
 import getTemplate from '../../table/funcs/getTemplate.js';
 import applyHook from '../../hook/funcs/applyHook.js';
 
@@ -26,33 +24,29 @@ export default async function getAccess({ table, user = {} }) {
   const hookData = await applyHook('getAccess', { table, user });
   if (hookData) return hookData;
 
-  const { uid, user_type: userType } = user;
+  const { uid, user_type: userType = 'regular' } = user;
 
-  if (config.auth?.disable || userType?.includes?.('admin')) {
+  if (userType.includes('admin')) {
     return { actions: ['view', 'edit', 'add', 'del'], query: '1=1' };
   }
 
-  const body = await getTemplate('table', table) || {};
+  const body = await getTemplate('table', table);
+  const tableActions = ['view'].concat(body?.actions || body?.action_default || []);
 
-  if (body.access === 'admin' && !userType?.includes?.('admin')) {
-    const { userActions = [] } = uid ? await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {}) : {};
-    const customActions = userActions.filter((el => ['view'].concat(body.actions || body.action_default || []).includes(el)));
-    return { actions: customActions, query: '1=1' };
+  if (body?.public || body?.access === 'public') {
+    return { actions: tableActions, query: '1=1' };
   }
 
-  const actions = uid ? ['view'].concat(body.actions || body.action_default || []) : [];
-
-  if (body?.public || body.access === 'public') {
-    return { actions, query: '1=1' };
+  if (body?.access === 'user' && uid) {
+    return { actions: tableActions, query: '1=1' };
   }
 
-  const dbTable = pgClients.client?.pk?.[table] ? table : body?.table;
-  if (!uid || !dbTable) return null;
+  const { userScope, userActions = [] } = uid
+    ? await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {})
+    : {};
 
-  const { userScope, userActions = [] } = await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {});
-  const query = body.access === 'user' || userScope === 'my' ? `uid='${uid}'` : null;
-  const customActions = userActions.filter((el => actions.includes(el)));
-  const scope = body.access === 'user' ? 'my' : userScope;
+  const query = uid && userScope === 'my' ? `uid='${uid}'` : '1=1';
+  const actions = userActions.filter((el => tableActions.includes(el)));
 
-  return { scope, actions: customActions, query };
+  return { scope: userScope, actions, query };
 }

package/server/routes/crud/controllers/update.js

@@ -5,7 +5,9 @@ import config from '../../../../config.js';
 import insert from './insert.js';
 
 export default async function update(req) {
-  const { user, params = {}, body = {} } = req;
+  const {
+    pg = pgClients.client, user, params = {}, body = {},
+  } = req;
   if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preUpdate', {
     table: params?.table, id: params?.id, user,
@@ -69,7 +71,7 @@ export default async function update(req) {
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {
-      const objId = body[schema[key].parent_id] || body?.id || res?.[schema[key]?.parent_id];
+      const objId = body[schema[key].parent_id] || body?.id || res?.[schema[key]?.parent_id] || res?.[pg.pk?.[loadTemplate?.table || table] || ''];
       // delete old extra data
       await pgClients.client.query(`delete from ${schema[key].table} where ${schema[key].parent_id}=$1`, [objId]); // rewrite?
       // insert new extra data