@opengis/fastify-table 2.0.162 → 2.1.0

package/dist/server/plugins/access/funcs/getUserPermissions.d.ts

@@ -1,5 +1,6 @@
-export default function getUserPermissions({ uid, resource }: {
+export default function getUserPermissions({ uid, resource, userType, }: {
     uid?: string;
     resource?: string;
+    userType?: string;
 }, pg?: any): Promise<any>;
 //# sourceMappingURL=getUserPermissions.d.ts.map

package/dist/server/plugins/access/funcs/getUserPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAYA,wBAA8B,kBAAkB,CAC9C,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACtD,EAAE,MAAmB,gBAkCtB"}
+{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAYA,wBAA8B,kBAAkB,CAC9C,EACE,GAAG,EACH,QAAQ,EACR,QAAQ,GACT,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACzD,EAAE,MAAmB,gBAsCtB"}

package/dist/server/plugins/access/funcs/getUserPermissions.js

@@ -7,9 +7,12 @@ from admin.role_access a
 left join admin.roles b on a.role_id=b.role_id and b.enabled
 left join admin.user_roles c on a.role_id=c.role_id
 where resource_id is not null and $1 in (a.user_uid, c.user_uid)`;
-export default async function getUserPermissions({ uid, resource }, pg = pgClients.client) {
+export default async function getUserPermissions({ uid, resource, userType, }, pg = pgClients.client) {
     if (!uid)
         return [];
+    if (userType === "admin") {
+        return resourcesList;
+    }
     // ? in case pg.pk not set yet
     const pks = await pg
         .query(`SELECT json_object_agg(conrelid::regclass, (SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]) ) 

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,sBA2GtB"}
+{"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,sBA8GtB"}

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

@@ -55,8 +55,10 @@ export default async function getAccess({ resource, table, form, user = {}, meth
         return { actions: ["view"], query: "1=1" };
     }
     if (resource) {
-        const permissions = await getUserPermissions({ resource, uid }, pg);
-        const actions = (permissions || []).flatMap((el) => el.actions.map((e) => matches[e] || e));
+        const permissions = await getUserPermissions({ resource, uid, userType }, pg);
+        const actions = (permissions || [])
+            .flatMap((el) => el.actions.map((e) => matches[e] || e))
+            .filter((el, idx, arr) => arr.indexOf(el) === idx);
         return {
             scope: permissions?.scope,
             actions,

package/dist/server/plugins/file/providers/fs.d.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 export default function fsStorage(): {
     deleteFile: (fp: string) => Promise<void>;
-    downloadFile: (fp: string, options?: Record<string, any>) => Promise<Buffer<ArrayBufferLike> | fs.ReadStream | {
+    downloadFile: (fp: string, options?: Record<string, any>) => Promise<NonSharedBuffer | fs.ReadStream | {
         original: string;
         full: string | null;
     } | null>;

package/dist/server/plugins/logger/getLogger.d.ts

@@ -1,6 +1,6 @@
 import { type FastifyRequest } from "fastify";
-import { pino } from "pino";
-interface ExtendedLogger extends pino.Logger {
+import { Logger } from "pino";
+interface ExtendedLogger extends Logger {
     file: (logfolder: string, msg: any, req?: FastifyRequest) => void;
     metrics: (key: string, val?: any, dbName?: string) => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAmDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AAiC/D,eAAe,MAAM,CAAC"}
+{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAa,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,UAAU,cAAe,SAAQ,MAAM;IACrC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAmDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AAqC/D,eAAe,MAAM,CAAC"}

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

@@ -1,4 +1,4 @@
-import { pino } from "pino";
+import pino from "pino";
 import config from "../../../config.js";
 import redactionList from "../../../redactionList.js";
 import getRedis from "../redis/funcs/getRedis.js";
@@ -42,7 +42,11 @@ const options = {
 };
 const logger = pino(options);
 logger.file = function userFile(logfolder, msg, req) {
-    logger.info({ logfolder, ...(typeof msg === "string" ? { msg } : msg) }, req);
+    logger.info({
+        logfolder,
+        ...(typeof msg === "string" ? { msg } : msg),
+        req,
+    });
 };
 if (config.debug) {
     logger.file("test/redaction", {

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

@@ -1,15 +1,15 @@
 const serializers = {
     req(request) {
-        const { method, url, referer, params, query, body, session, } = request;
+        const { method, url, headers, params, query, body, session } = request;
         const { uid = undefined, user_name: userName = undefined } = session?.passport?.user || {};
         return {
             method,
             url,
-            referer,
-            ip: request.headers?.['x-real-ip']
-                || request.headers?.['x-forwarded-for']
-                || request.ip
-                || request.connection?.remoteAddress,
+            referer: headers?.referer,
+            ip: request.headers?.["x-real-ip"] ||
+                request.headers?.["x-forwarded-for"] ||
+                request.ip ||
+                request.connection?.remoteAddress,
             uid,
             dbName: request.pg?.options?.database,
             user_name: userName,

package/dist/server/plugins/policy/funcs/checkPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,gBAAgB,CAC5C,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBAgEpB"}
+{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,gBAAgB,CAC5C,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBAkEpB"}

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

@@ -16,7 +16,7 @@ export default async function checkPermissions(req, reply) {
     if (!permissions?.length) {
         return null;
     }
-    const userPermissions = await getUserPermissions({ uid: user?.uid }, pg).then((arr) => arr.reduce((acc, curr) => ({ ...acc, [curr.name]: curr.actions }), {}));
+    const userPermissions = await getUserPermissions({ uid: user?.uid, userType: user?.user_type }, pg).then((arr) => arr.reduce((acc, curr) => ({ ...acc, [curr.name]: curr.actions }), {}));
     const havePermission = Object.keys(userPermissions).length &&
         permissions?.length &&
         permissions.length ===

package/dist/server/routes/auth/controllers/2factor/providers/totp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAU1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAmBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}
+{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAU1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAuBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}

package/dist/server/routes/auth/controllers/2factor/providers/totp.js

@@ -1,9 +1,14 @@
 import crypto from "node:crypto";
 import qrcode from "qrcode";
-import { authenticator } from "otplib";
+import * as authenticator from "otplib";
 import config from "../../../../../../config.js";
 const TYPE = "TOTP";
-const getOTP = (id, secret) => authenticator.keyuri(id.toString(), config.auth?.["2fa"]?.prefix || "SOFTPRO", secret);
+// equivalent to otplib@12.0.1 authenticator.keyuri(id,prefix,secret)
+// "otpauth://totp/SOFTPRO:777?secret=secret&period=30&digits=6&algorithm=SHA1&issuer=SOFTPRO"
+const getOTP = (id, secret) => {
+    const issuer = config.auth?.["2fa"]?.prefix || "SOFTPRO";
+    return `otpauth://totp/${issuer}:${encodeURIComponent(id.toString())}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=${encodeURIComponent(issuer)}`;
+};
 const enableSecret = async ({ uid, pg }) => {
     await pg.query("update admin.users_social_auth set enabled=true where uid = $1 and social_auth_type = $2", [uid, TYPE]);
 };

package/dist/server/routes/auth/controllers/core/getUserInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAmCA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eA+EjD"}
+{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAoCA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eAkFjD"}

package/dist/server/routes/auth/controllers/core/getUserInfo.js

@@ -1,4 +1,5 @@
 import config from "../../../../../config.js";
+// import logger from "../../../../plugins/logger/getLogger.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
 import applyHook from "../../../../plugins/hook/applyHook.js";
 import getRedis from "../../../../plugins/redis/funcs/getRedis.js";
@@ -74,7 +75,7 @@ export default async function getUserInfo(req) {
         req.user?.uid
         ? await pg.query(q, [user.uid]).then((el) => el.rows || [])
         : [];
-    const permissions = await getUserPermissions({ uid: user?.uid }, pg);
+    const permissions = await getUserPermissions({ uid: user?.uid, userType: user?.user_type }, pg);
     Object.assign(payload, {
         user: userInfo,
         settings,

package/dist/server/routes/auth/controllers/euSign/authByData.js

@@ -1,4 +1,4 @@
-import { Agent } from "undici";
+import { fetch, Agent } from "undici";
 import config from "../../../../../config.js";
 import { applyHook } from "../../../../../utils.js";
 import logger from "../../../../plugins/logger/getLogger.js";

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

@@ -6,7 +6,7 @@ export default async function tableData(req, reply, called) {
     const q = `select attr,
     (select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) 
     from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`;
-    const { rows = [] } = pg?.pk?.["admin.rules"] && user?.uid
+    const { rows = [] } = pg?.pk?.["admin.rules"] && pg?.pk?.["admin.account_grants"] && user?.uid
         ? await pg.query(q, [params.table, user.uid])
         : {};
     const contextQuery = rows

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.162",
+  "version": "2.1.0",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -39,56 +39,56 @@
     "start": "LOG_LEVEL=trace bun server"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.879.0",
-    "@aws-sdk/lib-storage": "3.879.0",
+    "@aws-sdk/client-s3": "3.1018.0",
+    "@aws-sdk/lib-storage": "3.1018.0",
     "@fastify/cookie": "11.0.2",
-    "@fastify/http-proxy": "11.1.2",
-    "@fastify/multipart": "9.0.3",
+    "@fastify/http-proxy": "11.4.3",
+    "@fastify/multipart": "9.4.0",
     "@fastify/passport": "3.0.2",
     "@fastify/rate-limit": "10.3.0",
-    "@fastify/session": "11.1.0",
-    "@grpc/grpc-js": "1.10.11",
-    "@grpc/proto-loader": "0.7.15",
+    "@fastify/session": "11.1.1",
+    "@grpc/grpc-js": "1.14.3",
+    "@grpc/proto-loader": "0.8.0",
     "apache-crypt": "1.2.6",
     "better-sqlite3": "12.2.0",
-    "dotenv": "16.5.0",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
+    "dotenv": "17.3.1",
+    "fastify": "5.8.4",
+    "fastify-plugin": "5.1.0",
     "fastify-session-redis-store": "7.1.2",
-    "handlebars": "4.7.8",
-    "image-size": "1.2.0",
-    "ioredis": "5.3.2",
-    "js-yaml": "4.1.0",
-    "markdown-it": "14.1.0",
-    "nodemailer": "7.0.6",
-    "otplib": "12.0.1",
-    "pg": "8.11.6",
-    "pino": "9.5.0",
-    "pino-abstract-transport": "2.0.0",
+    "handlebars": "4.7.9",
+    "image-size": "2.0.2",
+    "ioredis": "5.10.1",
+    "js-yaml": "4.1.1",
+    "markdown-it": "14.1.1",
+    "nodemailer": "8.0.4",
+    "otplib": "13.4.0",
+    "pg": "8.20.0",
+    "pino": "10.3.1",
+    "pino-abstract-transport": "3.0.0",
     "promised-handlebars": "2.0.1",
     "qrcode": "1.5.4",
     "sharp": "0.34.5",
     "uglify-js": "3.19.3",
-    "undici": "7.16.0"
+    "undici": "7.24.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "^1.3.5",
     "@types/js-yaml": "^4.0.9",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.12.0",
     "@types/nodemailer": "^7.0.1",
     "@types/passport": "^1.0.17",
     "@types/passport-local": "^1.0.38",
     "@types/pg": "^8.15.5",
     "@types/qrcode": "^1.5.5",
     "copyfiles": "^2.4.1",
-    "eslint": "^9.35.0",
-    "eslint-config-airbnb-extended": "^2.3.1",
+    "eslint": "^10.1.0",
+    "eslint-config-airbnb-extended": "^3.0.1",
     "ts-migrate": "^0.1.35",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.2"
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}