@opengis/fastify-table 2.4.17 → 2.4.19

package/dist/server/plugins/pg/funcs/getMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAyE5D"}
+{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAmG5D"}

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -3,7 +3,7 @@ import getPG from "./getPG.js";
 import { BadRequestError } from "../../../../errors.js";
 const data = {};
 export default async function getMeta(opt, nocache) {
-    const pg = opt?.pg || getPG({ name: "client" });
+    const pg = opt?.pg || getPG();
     if (!pg) {
         throw BadRequestError("pg client not found");
     }
@@ -11,24 +11,42 @@ export default async function getMeta(opt, nocache) {
     if (!pg.pk || nocache) {
         await init(pg);
     }
-    const table1 = opt?.table || opt;
-    const table = pg.pk?.[table1] ? table1 : table1?.replace?.(/"/g, "");
-    if (pg?.options?.database && data[pg.options.database]?.[table] && !nocache)
-        return data[pg.options.database][table];
-    if (!pg?.tlist?.includes(table) &&
-        !pg?.tlist?.includes(table?.replace?.(/"/g, ""))) {
-        throw BadRequestError(`table not found: ${table}`);
+    const tableOriginal = opt?.table || opt;
+    const [schemaName, tableName] = tableOriginal?.replace?.(/"/g, "").split(".");
+    const tableSafe = `${schemaName}."${tableName}"`;
+    const tableUnsafe = `${schemaName}.${tableName}`;
+    if (pg?.options?.database &&
+        data[pg.options.database]?.[tableUnsafe] &&
+        !nocache) {
+        return data[pg.options.database][tableUnsafe];
     }
-    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const tableRows = await pg
+        .query(`SELECT
+        nspname || '.' || relname as name,
+        relkind
+      FROM pg_class a
+      JOIN pg_namespace b
+        ON b.oid = a.relnamespace
+      WHERE relkind IN ('r', 'v', 'm')`)
+        .then((r) => r.rows || []);
+    const tlist = tableRows.map((el) => el.name);
+    if (!tlist.includes(tableUnsafe)) {
+        throw BadRequestError(`table not found: ${tableOriginal}`);
+    }
+    const relkinds = tableRows.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.relkind }), {});
+    const fields = await pg
+        .query(`select * from ${tableSafe} limit 0`)
+        .then((r) => r.fields || []);
+    // remove quotes from table names
     const pks1 = await pg
-        .query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
+        .query(`SELECT json_object_agg(replace(c.conrelid::regclass::text,'"',''), a.attname) 
   FROM pg_constraint c 
     left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
-  WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table])
-        .then((el) => el.rows[0].pks1 || {});
-    const pk = table.startsWith("public.")
-        ? pks1[table.replace("public.", "")]
-        : pks1[table] || pg.pk[table];
+  WHERE c.contype='p'::"char"`)
+        .then((r) => r.rows[0].json_object_agg || {});
+    const pk = tableUnsafe.startsWith("public.")
+        ? pks1[tableUnsafe.replace("public.", "")]
+        : pks1[tableUnsafe];
     const geomColumns = fields.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry");
     const geomAttr = geomColumns.find((el) => el.name === "geom_4326") || geomColumns[0];
     const dbColumns = await pg
@@ -36,21 +54,20 @@ export default async function getMeta(opt, nocache) {
     attname, 
     json_build_object(
       'title', pg_catalog.col_description(attrelid,attnum)
-      /*,'type', atttypid::regtype */
     )
   ) from pg_catalog.pg_attribute a 
-  where attrelid=$1::regclass and attnum>0`, [table])
+  where attrelid=$1::regclass and attnum>0`, [tableSafe])
         .then((el) => el.rows?.[0]?.json_object_agg || {});
     fields.forEach((el) => Object.assign(el, { ...(dbColumns[el.name] || {}) }));
     const res = {
         pk,
         columns: fields,
         geom: geomAttr?.name,
-        view: ["v", "m"].includes(pg.relkinds?.[table]),
+        view: ["v", "m"].includes(relkinds?.[tableSafe]),
     };
     if (!data[pg.options.database]) {
         data[pg.options.database] = {};
     }
-    data[pg.options.database][table] = res;
+    data[pg.options.database][tableUnsafe] = res;
     return res;
 }

package/dist/server/plugins/pg/funcs/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,iBA6NtC;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,iBA8NtC;AAGD,eAAe,IAAI,CAAC"}

package/dist/server/plugins/pg/funcs/init.js

@@ -78,6 +78,8 @@ async function init(client) {
             throw new Error("empty pg client");
         try {
             const data = await client.query(q, args);
+            if (config.trace)
+                console.log(q, args);
             return data;
         }
         catch (err) {

package/dist/server/routes/file/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/file/index.ts"],"names":[],"mappings":"AAgBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA+BtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/file/index.ts"],"names":[],"mappings":"AAoBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA8BtC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/file/index.js

@@ -9,14 +9,15 @@ import uploadImage from "./controllers/uploadImage.js";
 import deleteFileAPI from "./controllers/delete.js";
 import { resizeSchema } from "./schema.js";
 const tags = ["core", "file"];
+const { uploadPolicy = "L1" } = config;
 const publicParams = { config: { tags, policy: "L0" } };
+const privateParams = { config: { tags, policy: uploadPolicy } };
 function plugin(app, opt = {}) {
-    app.get("/files/*", { config: { tags, policy: "L0" } }, files);
+    app.get("/files/*", publicParams, files);
     if (!app.hasRoute({ method: "GET", url: "/file/resize" })) {
         app.get("/file/resize", {
             config: {
-                tags,
-                policy: "L0",
+                ...publicParams,
                 rateLimit: config.rateLimit
                     ? {
                         max: +(config.rateLimit?.resize?.max || 1000),
@@ -28,8 +29,8 @@ function plugin(app, opt = {}) {
         }, resize);
     }
     app.get("/api/resize-all", { config: { tags, role: "admin" }, schema: resizeSchema }, resizeAll);
-    app.post("/file/upload/*", publicParams, upload);
-    app.post("/file/upload-image/*", publicParams, uploadImage);
+    app.post("/file/upload/*", privateParams, upload);
+    app.post("/file/upload-image/*", privateParams, uploadImage);
     app.get("/file/download/*", publicParams, download);
     app.get("/file/delete/*", publicParams, deleteFileAPI);
     app.get(`/api/export`, publicParams, exportTable);

package/dist/server/routes/upload/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QAmGtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QA2GtC"}

package/dist/server/routes/upload/index.js

@@ -1,17 +1,20 @@
 import config from "../../../config.js";
-const { chunkSize = 5242880 } = config;
+const { chunkSize = 5242880, uploadPolicy = "L1" } = config;
 import { prefix } from "../../plugins/upload/index.js";
 import startUpload from "../../plugins/upload/startUpload.js";
 import uploadChunk from "../../plugins/upload/uploadChunk.js";
 import getUploadStatus from "../../plugins/upload/getUploadStatus.js";
 import { BadRequestError, LengthRequiredError } from "../../../errors.js";
-const policy = "L0"; // public
 const tags = ["core", "upload"];
 export default function plugin(app) {
     // provide server with metadata for chunked upload
     app.post(`/${prefix}/start`, {
-        config: { tags, description: "Init chunked upload", policy },
-    }, async (req, reply) => {
+        config: {
+            tags,
+            description: "Init chunked upload",
+            policy: uploadPolicy,
+        },
+    }, async (req) => {
         const { fileName, size, subdir, id } = req.body || {};
         if (!fileName || !size) {
             throw BadRequestError("fileName and size are required");
@@ -33,7 +36,7 @@ export default function plugin(app) {
         config: {
             tags,
             description: "Upload chunk of data",
-            policy: config.uploadChunkPolicy || policy,
+            policy: uploadPolicy,
             rateLimit: config.rateLimit
                 ? {
                     max: +(config.rateLimit?.uploadChunk?.max || 1000),
@@ -67,7 +70,11 @@ export default function plugin(app) {
     });
     // check upload status
     app.get(`/${prefix}/:id`, {
-        config: { tags, description: "Check chunked upload status", policy },
+        config: {
+            tags,
+            description: "Check chunked upload status",
+            policy: uploadPolicy,
+        },
     }, async (req) => {
         const { id } = req.params;
         const status = await getUploadStatus({ id });

package/dist/server/routes/widget/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/widget/index.ts"],"names":[],"mappings":"AAkDA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,QAmHrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/widget/index.ts"],"names":[],"mappings":"AAoDA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,QAiIrC"}

package/dist/server/routes/widget/index.js

@@ -1,4 +1,5 @@
 import { addHook } from "../../../utils.js";
+import config from "../../../config.js";
 import widgetDel from "./controllers/widget.del.js";
 import widgetSet from "./controllers/widget.set.js";
 import widgetGet from "./controllers/widget.get.js";
@@ -8,7 +9,9 @@ import widgetEntityGet from "./services/widget.entity.get.js";
 import widgetEntitySet from "./services/widget.entity.set.js";
 import widgetEntityDel from "./services/widget.entity.del.js";
 import uploadMultiPart from "../../plugins/file/uploadMultiPart.js";
+import { UnauthorizedError } from "../../../errors.js";
 const tags = ["core", "widget"];
+const { uploadPolicy = "L1" } = config;
 const tableSchema = {
     params: {
         type: "object",
@@ -37,10 +40,9 @@ const tableSchema = {
     },
 };
 addHook("onWidgetSet", onWidgetSet);
-const policy = "L0";
-const params = { config: { tags, policy }, schema: tableSchema };
+const publicParams = { config: { tags, policy: "L0" }, schema: tableSchema };
 export default function route(app) {
-    app.get("/v2/widget/:type/:entityType/:objectid", params, async (req) => {
+    app.get("/v2/widget/:type/:entityType/:objectid", publicParams, async (req) => {
         const result = await widgetEntityGet({
             type: req.params.type,
             entityType: req.params.entityType,
@@ -51,9 +53,12 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.post("/v2/widget/:type/:entityType/:objectid", params, async (req) => {
+    app.post("/v2/widget/:type/:entityType/:objectid", publicParams, async (req) => {
         if (["gallery", "file"].includes(req.params.type) &&
             req.headers["content-type"]?.startsWith("multipart/form-data")) {
+            if (!req.user?.uid && uploadPolicy !== "L0") {
+                throw UnauthorizedError("unauthorized");
+            }
             const file = await uploadMultiPart(req);
             const result = await widgetEntitySet({
                 type: req.params.type,
@@ -74,9 +79,12 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.put("/v2/widget/:type/:entityType/:objectid/:id", params, async (req) => {
+    app.put("/v2/widget/:type/:entityType/:objectid/:id", publicParams, async (req) => {
         if (["gallery", "file"].includes(req.params.type) &&
             req.headers["content-type"]?.startsWith("multipart/form-data")) {
+            if (!req.user?.uid && uploadPolicy !== "L0") {
+                throw UnauthorizedError("unauthorized");
+            }
             const file = await uploadMultiPart(req);
             const result = await widgetEntitySet({
                 type: req.params.type,
@@ -99,7 +107,7 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.delete("/v2/widget/:type/:entityType/:objectid/:id", params, async (req) => {
+    app.delete("/v2/widget/:type/:entityType/:objectid/:id", publicParams, async (req) => {
         const result = await widgetEntityDel({
             type: req.params.type,
             entityType: req.params.entityType,
@@ -110,9 +118,9 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.get("/widget/:type/:objectid", params, widgetGet);
-    app.post("/widget/:type/:objectid/:id?", params, widgetSet);
-    // app.put("/widget/:type/:objectid/:id", params, widgetSet);
-    app.delete("/widget/:type/:objectid/:id", params, widgetDel);
-    app.put("/file-edit/:id", params, fileEdit);
+    app.get("/widget/:type/:objectid", publicParams, widgetGet);
+    app.post("/widget/:type/:objectid/:id?", publicParams, widgetSet);
+    // app.put("/widget/:type/:objectid/:id", publicParams, widgetSet);
+    app.delete("/widget/:type/:objectid/:id", publicParams, widgetDel);
+    app.put("/file-edit/:id", publicParams, fileEdit);
 }

package/package.json

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