@opengis/fastify-table 2.5.16 → 2.5.17

package/dist/server/plugins/policy/funcs/checkPolicy.js

@@ -13,7 +13,7 @@ export default function checkPolicy(req, jwt) {
     const { role, referer, policy = [], } = (routeOptions?.config || {});
     // role=admin|regular
     const isRole = (role && (!user?.user_type || !role?.includes?.(user?.user_type))) ||
-        (policy.includes("admin") && user?.user_type !== "admin");
+        (policy.includes("admin") && !user?.user_type?.includes?.("admin"));
     const allowExtPublic = [".png", ".jpg", ".svg"];
     const ext = path.toLowerCase().substr(-4);
     const isPublic = Array.isArray(policy)

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;AAqB5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBA+PZ"}
+{"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;AAqB5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAoQZ"}

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

@@ -47,11 +47,11 @@ export default async function tableAPI(req, reply, called) {
     const table = loadTable?.table || table1;
     const form = loadTable?.form || form1;
     const id = hookData?.id || tokenData?.id || params.id;
-    if (tokenData && !id) {
+    if (tokenData && !table) {
         throw ForbiddenError("invalid token");
     }
-    if (!table && !id) {
-        throw BadRequestError("not enough params: table && id");
+    if (!table) {
+        throw BadRequestError("not enough params: table");
     }
     const { actions = [], query: accessQuery, message: accessMessage, } = (await getAccess({
         resource,
@@ -135,10 +135,12 @@ export default async function tableAPI(req, reply, called) {
             .join(";");
         return `${q};${extraQ || ""}`.replace(/\$1/g, `'${id}'`);
     }
-    const data = await pg
-        .query(q.replace(/{{uid}}/, user?.uid), [id])
-        .then((el) => el.rows[0]);
-    if (!data) {
+    const data = id
+        ? await pg
+            .query(q.replace(/{{uid}}/, user?.uid), [id])
+            .then((el) => el.rows[0])
+        : null;
+    if (id && !data) {
         throw NotFoundError(`object not found: ${id}`);
     }
     Object.keys(schema)
@@ -148,7 +150,7 @@ export default async function tableAPI(req, reply, called) {
             data[key] = null;
         }
     });
-    if (extraKeys?.length) {
+    if (id && extraKeys?.length) {
         await Promise.all(extraKeys?.map(async (key) => {
             const { colModel, table: extraTable, parent_id: parentId, } = schema[key];
             const colModel1 = Array.isArray(colModel)
@@ -167,7 +169,8 @@ export default async function tableAPI(req, reply, called) {
     if (user?.uid &&
         !config.security?.disableToken &&
         actions.includes("edit") &&
-        !called) {
+        !called &&
+        id) {
         data.token = tokenData?.table
             ? params.table
             : setToken({
@@ -176,7 +179,9 @@ export default async function tableAPI(req, reply, called) {
                 array: 1,
             })?.[0];
     }
-    await extraDataGet({ rows: [data], table, form }, pg);
+    if (id) {
+        await extraDataGet({ rows: [data], table, form }, pg);
+    }
     const res = await applyHook("afterTable", {
         pg,
         table,

package/package.json

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