@opengis/fastify-table 2.6.6 → 2.6.8

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAiD3E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAsD3E,eAAe,MAAM,CAAC"}

package/dist/config.js

@@ -3,6 +3,7 @@ import dotenv from "dotenv";
 dotenv.config(); // ! load .env (workaround for node)
 import { existsSync, readFileSync } from "node:fs";
 import unflattenObject from "./server/plugins/util/funcs/unflattenObject.js";
+import { randomUUID } from "node:crypto";
 const fileName = ["config.json", "/data/local/config.json"].find((el) => existsSync(el) ? el : null);
 const config = fileName ? JSON.parse(readFileSync(fileName, "utf-8")) : {};
 const { skipKeys = ["windir"] } = config;
@@ -38,6 +39,11 @@ function loadEnvConfig() {
         (key.charAt(0) === key.charAt(0)?.toLowerCase?.() || key.includes(".")))
         .reduce((acc, curr) => ({ ...acc, [curr]: process.env[curr] }), {});
     Object.assign(config, unflattenObject(configKeys));
+    if (!config.auth?.secret) {
+        config.auth = config.auth || {};
+        config.auth.secret = randomUUID().replace(/-/g, "");
+        console.warn("environment variable auth.secret not set");
+    }
 }
 loadEnvConfig();
 export default config;

package/dist/server/plugins/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAYtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAiIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAiIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/auth/index.js

@@ -8,9 +8,6 @@ import getRedis from "../redis/funcs/getRedis.js";
 import { ForbiddenError } from "../../../errors.js";
 const { prefix = "/api" } = config;
 const { auth } = config || {};
-if (!auth?.secret && process.platform !== 'win32') {
-    throw new Error("environment variable auth.secret not set");
-}
 const fastifyPassport = new Authenticator();
 export async function onRequest(req, reply) {
     const { hostname, headers, routeOptions } = req;
@@ -127,7 +124,7 @@ function plugin(fastify) {
         parseOptions: config?.auth?.cookieOptions || { secure: false },
     });
     fastify.register(session, {
-        secret: auth?.secret || 'fastify-session-redis-store-secret',
+        secret: auth?.secret || "fastify-session-redis-store-secret",
         cookieName: "session_auth",
         cookie: config?.auth?.cookieOptions || { secure: false },
         store: new RedisStore({

package/dist/server/plugins/crud/funcs/getAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AA8BA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,MAAc,EAAE,EAAE,GAAG,EACzD,EAAE,MAAmB,sBA4HtB"}
+{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AA8BA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,MAAc,EAAE,EAAE,GAAG,EACzD,EAAE,MAAmB,sBA8HtB"}

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

@@ -24,7 +24,7 @@ left join admin.user_roles d on
             then d.expiration > CURRENT_DATE 
             else 1=1 
         end )
-where $1 in (a.route_id, a.alias, a.table_name) and $2 in (b.user_uid, d.user_uid)`;
+where ($1 in (a.route_id, a.table_name, a.alias) or $2 in (a.route_id, a.table_name, a.alias)) and $3 in (b.user_uid, d.user_uid)`;
 /**
  * @param {Array} user_roles.actions Actions - user actions <> group actions
  * @param {Array} role_access.actions Actions - user actions = group actions
@@ -112,7 +112,9 @@ export default async function getAccess({ resource, table, form, user = {}, meth
         pg.pk?.["admin.role_access"] &&
         pg.pk?.["admin.roles"] &&
         pg.pk?.["admin.user_roles"]
-        ? await pg.query(q, [table, uid]).then((el) => ({
+        ? await pg
+            .query(q, [table.replace(/\.table$/, ""), table, uid])
+            .then((el) => ({
             ...(el.rows[0] || {}),
             roles: el.rows?.map?.((row) => row.role_id) || [],
             actions: el.rows?.map?.((row) => row.actions).flat() || [],

package/dist/server/plugins/logger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAqE7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QAmD7C;AACD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAqE7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QAsD7C;AACD,eAAe,YAAY,CAAC"}

package/dist/server/plugins/logger/index.js

@@ -89,7 +89,10 @@ function loggerPlugin(fastify) {
         });
     });
     fastify.addHook("onListen", async () => {
-        logger.file("init", { db: pgClients.client?.options?.database });
+        logger.file("init", {
+            db: pgClients.client?.options?.database,
+            port: process.env.PORT || 3000,
+        });
     });
 }
 export default loggerPlugin;

package/package.json

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