@opengis/fastify-table 2.0.131 → 2.0.132

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

@@ -31,7 +31,7 @@ where $1 in (a.route_id, a.alias, a.table_name) and $2 in (b.user_uid, d.user_ui
 export default async function getAccess({ table, form, user = {}, method = 'GET' }, pg = pgClients.client) {
     if (!table)
         return null;
-    const hookData = await applyHook("getAccess", { table, user, pg });
+    const hookData = await applyHook("getAccess", { table, user, pg, method });
     if (hookData)
         return hookData;
     const { uid, user_type: userType = "regular" } = user;

package/dist/server/routes/crud/controllers/deleteCrud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteCrud.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/deleteCrud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAa5C,wBAA8B,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA8HrE"}
+{"version":3,"file":"deleteCrud.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/deleteCrud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAa5C,wBAA8B,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAsIrE"}

package/dist/server/routes/crud/controllers/deleteCrud.js

@@ -36,7 +36,13 @@ export default async function deleteCrud(req, reply) {
             code: 403,
         });
     }
-    const { actions = [] } = (await getAccess({ table: del, id, user, method }, pg)) || {};
+    const { actions = [], message: accessMessage } = (await getAccess({ table: del, id, user, method }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
     if (!tokenData &&
         !config?.local &&
         !config.security?.disableToken &&

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA6KjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAqLjE"}

package/dist/server/routes/crud/controllers/insert.js

@@ -38,7 +38,13 @@ export default async function insert(req, reply) {
         (config.security?.disableToken || config.local || config.auth?.disable
             ? req.params
             : {});
-    const { actions = [] } = (await getAccess({ table: add, form, user, method }, pg)) || {};
+    const { actions = [], message: accessMessage } = (await getAccess({ table: add, form, user, method }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
     if (!tokenData &&
         !config.local &&
         !config.security?.disableToken &&

package/dist/server/routes/crud/controllers/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAmOZ"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBA0OZ"}

package/dist/server/routes/crud/controllers/table.js

@@ -41,13 +41,19 @@ export default async function tableAPI(req, reply, called) {
     if (!table && !id) {
         return reply.status(400).send("not enough params");
     }
-    const { actions = [], query: accessQuery } = (await getAccess({
+    const { actions = [], query: accessQuery, message: accessMessage } = (await getAccess({
         table: templateName,
         form,
         id,
         user,
         method,
     }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
     if (!tokenData &&
         !config?.local &&
         !config.security?.disableToken &&

package/dist/server/routes/crud/controllers/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA8LxD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAqMxD"}

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

@@ -40,13 +40,19 @@ export default async function update(req, reply) {
         (config.security?.disableToken || config.local || config.auth?.disable
             ? params
             : {});
-    const { actions = [] } = (await getAccess({
+    const { actions = [], message: accessMessage } = (await getAccess({
         table: edit,
         form,
         id,
         user,
         method,
     }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
     if (!tokenData &&
         !config.local &&
         !config.security?.disableToken &&

package/dist/server/routes/table/controllers/card.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AAOA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAmItD"}
+{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AAOA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAoItD"}

package/dist/server/routes/table/controllers/card.js

@@ -18,7 +18,7 @@ export default async function card(req, reply) {
             : hookData.message;
         return reply.status(hookData.status).send(response);
     }
-    const { actions = [], scope, my, } = (await getAccess({
+    const { actions = [], scope, my, message: accessMessage, } = (await getAccess({
         table: hookData?.table || params.table,
         id: hookData?.id || params?.id,
         user,

package/dist/server/routes/table/controllers/cardData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cardData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardData.ts"],"names":[],"mappings":"AAuBA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAuO7D"}
+{"version":3,"file":"cardData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardData.ts"],"names":[],"mappings":"AAuBA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA8O7D"}

package/dist/server/routes/table/controllers/cardData.js

@@ -23,6 +23,12 @@ export default async function getCardData(req, reply) {
     const time = Date.now();
     const template = await getTemplate("card", table);
     const access = (await getAccess({ table, id, user, method }, pg));
+    if (access?.message) {
+        return reply.status(403).send({
+            error: access.message,
+            code: 403,
+        });
+    }
     if (!access?.actions?.length) {
         return reply.status(403).send("access restricted");
     }

package/dist/server/routes/table/controllers/getFormByTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAY5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,EACV,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,gBAsKpB"}
+{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAY5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,EACV,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,gBA6KpB"}

package/dist/server/routes/table/controllers/getFormByTable.js

@@ -36,7 +36,13 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     if (!form) {
         // return reply.status(404).send("form not found");
     }
-    const { actions = [] } = (await getAccess({ table, id: edit, form, user, method }, pg)) || {};
+    const { actions = [], message: accessMessage } = (await getAccess({ table, id: edit, form, user, method }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
     const loadTemplate = await getTemplate("form", form || params.name);
     if (!loadTemplate) {
         return reply.status(404).send("form template not found");

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4EzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAs0Bb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4EzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA60Bb"}

package/dist/server/routes/table/functions/getData.js

@@ -128,15 +128,21 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         return reply.status(404).send("template not found");
     }
     const objectId = tokenData?.id || hookData?.id || params?.id || id;
-    const { actions = [], query: accessQuery } = actionsParam
-        ? { actions: actionsParam, query: accessQueryParam || "1=1" }
+    const { actions = [], query: accessQuery, message: accessMessage } = actionsParam
+        ? { actions: actionsParam, query: accessQueryParam || "1=1", message: undefined }
         : (await getAccess({
             table: templateName,
             id: objectId,
             user,
             method,
-        }, pg));
-    const body = loadTable || hookData || tokenData;
+        }, pg)) || {};
+    if (accessMessage) {
+        return reply.status(403).send({
+            error: accessMessage,
+            code: 403,
+        });
+    }
+    // const body = loadTable || hookData || tokenData;
     const { table: table1, columns = [], sql, cardSql, form, meta, sqlColumns, public: ispublic, editable = false, } = loadTable || hookData || tokenData || params || { table };
     if (!ispublic && !user?.uid && !called) {
         return reply.status(401).send({ error: "unauthorized", code: 401 });

package/package.json

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