@opengis/fastify-table 2.4.6 → 2.4.7

package/dist/module/core/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')

package/dist/server/migrations/oauth.sql.sql

@@ -0,0 +1,77 @@
+CREATE schema if not exists oauth;
+
+CREATE TABLE if not exists oauth.clients (
+  client_id              text PRIMARY KEY DEFAULT next_id(),   -- ID клієнта (публічний ідентифікатор)
+  client_secret_hash     text,                                 -- Хеш секрету (NULL для public-клієнтів)
+  name                   text NOT NULL,                        -- Назва застосунку
+  type                   text NOT NULL CHECK (type IN ('public','confidential')),
+  token_endpoint_auth_method text NOT NULL CHECK (token_endpoint_auth_method IN ('client_secret_basic','client_secret_post','private_key_jwt','none')),
+  owner_user_id          text,                                 -- Власник/адміністратор клієнта (посилання на users.id or other id)
+
+  redirect_uris          text[],         					   -- Дозволені redirect_uri  
+  grant_types            text[]  CHECK (case when grant_types is not null then grant_types <@ ARRAY['authorization_code','refresh_token','client_credentials','device_code']::text[] else true end),
+  require_pkce           boolean NOT NULL DEFAULT true,
+  scopes         text[],  
+  allowed_cors_origins   text[],
+  jwks                   jsonb,                                -- Вбудований JWK Set (опційно)  
+
+  created_at             timestamptz NOT NULL DEFAULT now(),
+  updated_at             timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE if not exists oauth.tokens (
+  id                     text PRIMARY KEY DEFAULT next_id(),
+  token_type             text NOT NULL CHECK (token_type IN ('access','refresh')),
+  token_hash             text NOT NULL UNIQUE,                  -- Argon2/bcrypt/SCrypt (хеш у застосунку)
+  token_hint             text,                                  -- останні 6-8 символів для діагностики (необов’язково)
+  jti                    text UNIQUE,                           -- JWT ID, якщо токен — JWT
+  client_id              text NOT NULL REFERENCES oauth.clients(client_id) ON DELETE CASCADE,
+  user_id                text,                                  -- NULL для client_credentials    
+  issuer                 text,                                  -- iss
+  scopes                 text[],
+  claims                 jsonb,                                 -- додаткові клейми
+  issued_at              timestamptz NOT NULL DEFAULT now(),
+  expires_at             timestamptz NOT NULL,
+  revoked_at             timestamptz,
+  revocation_reason      text,
+  ip                     inet                                  -- IP видачі/використання (опційно)  
+);
+
+COMMENT ON SCHEMA oauth IS 'Schema for OAuth2 / OpenID Connect clients and tokens';
+
+-- Comments for oauth.clients
+COMMENT ON TABLE oauth.clients IS 'OAuth 2.0 clients (applications) that can request tokens';
+
+COMMENT ON COLUMN oauth.clients.client_id IS 'Client identifier (public ID, generated by next_id())';
+COMMENT ON COLUMN oauth.clients.client_secret_hash IS 'Hashed client secret (NULL for public clients)';
+COMMENT ON COLUMN oauth.clients.name IS 'Name of the application/client';
+COMMENT ON COLUMN oauth.clients.type IS 'Client type: public or confidential';
+COMMENT ON COLUMN oauth.clients.token_endpoint_auth_method IS 'Authentication method at token endpoint (client_secret_basic, client_secret_post, private_key_jwt, none)';
+COMMENT ON COLUMN oauth.clients.owner_user_id IS 'Owner/administrator of the client (reference to users.id or external id)';
+COMMENT ON COLUMN oauth.clients.redirect_uris IS 'Allowed redirect URIs';
+COMMENT ON COLUMN oauth.clients.grant_types IS 'Allowed grant types (authorization_code, refresh_token, client_credentials, device_code)';
+COMMENT ON COLUMN oauth.clients.require_pkce IS 'Whether PKCE is required (default true)';
+COMMENT ON COLUMN oauth.clients.scopes IS 'Allowed OAuth2 scopes';
+COMMENT ON COLUMN oauth.clients.allowed_cors_origins IS 'Allowed CORS origins for browser-based apps';
+COMMENT ON COLUMN oauth.clients.jwks IS 'Embedded JSON Web Key Set (optional)';
+COMMENT ON COLUMN oauth.clients.created_at IS 'Creation timestamp';
+COMMENT ON COLUMN oauth.clients.updated_at IS 'Last update timestamp';
+
+-- Comments for oauth.tokens
+COMMENT ON TABLE oauth.tokens IS 'Issued OAuth 2.0 tokens (access or refresh)';
+
+COMMENT ON COLUMN oauth.tokens.id IS 'Internal token ID (generated by next_id())';
+COMMENT ON COLUMN oauth.tokens.token_type IS 'Type of token: access or refresh';
+COMMENT ON COLUMN oauth.tokens.token_hash IS 'Secure hash of the token (Argon2/bcrypt/SCrypt)';
+COMMENT ON COLUMN oauth.tokens.token_hint IS 'Optional hint (last 6–8 characters of token) for diagnostics';
+COMMENT ON COLUMN oauth.tokens.jti IS 'JWT ID if token is a JWT (unique)';
+COMMENT ON COLUMN oauth.tokens.client_id IS 'Reference to oauth.clients (issuing client)';
+COMMENT ON COLUMN oauth.tokens.user_id IS 'User ID if bound to user (NULL for client_credentials flow)';
+COMMENT ON COLUMN oauth.tokens.issuer IS 'Token issuer (iss claim)';
+COMMENT ON COLUMN oauth.tokens.scopes IS 'Granted OAuth2 scopes for this token';
+COMMENT ON COLUMN oauth.tokens.claims IS 'Additional claims (JSONB)';
+COMMENT ON COLUMN oauth.tokens.issued_at IS 'Timestamp when issued';
+COMMENT ON COLUMN oauth.tokens.expires_at IS 'Timestamp when token expires';
+COMMENT ON COLUMN oauth.tokens.revoked_at IS 'Timestamp when revoked';
+COMMENT ON COLUMN oauth.tokens.revocation_reason IS 'Reason for revocation (if any)';
+COMMENT ON COLUMN oauth.tokens.ip IS 'IP address of issuance/usage (optional)';

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

@@ -0,0 +1,39 @@
+import config from "../../../config.js";
+export const hookList = {};
+export async function applyHook(name, data) {
+    if (config.trace)
+        console.log("applyHook", name);
+    if (!hookList[name]?.length)
+        return null;
+    const result = {};
+    await Promise.all(hookList[name].map(async (hook) => {
+        const hookData = await hook({ ...data, config });
+        if (hookData) {
+            if (config.trace)
+                console.log("applyHook", name, hookData);
+            Object.assign(result, hookData);
+        }
+    })).catch((err) => {
+        console.error("applyHook", name, err.toString());
+    });
+    if (Object.keys(result).length) {
+        return result;
+    }
+    return null;
+}
+export function addHook(name, fn) {
+    if (!hookList[name]) {
+        hookList[name] = [];
+    }
+    if (config.trace)
+        console.log("addHook", name);
+    hookList[name].push(fn);
+}
+export function applyHookSync(name, data) {
+    if (!hookList[name]?.length)
+        return null;
+    if (config.trace)
+        console.log("applyHookSync", name);
+    const hookData = hookList[name].map((hook) => hook(data))[0];
+    return hookData;
+}

package/dist/server/plugins/migration/index.d.ts

@@ -0,0 +1,3 @@
+declare function plugin(): Promise<void>;
+export default plugin;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/migration/index.ts"],"names":[],"mappings":"AAEA,iBAAe,MAAM,kBAEpB;AAED,eAAe,MAAM,CAAC"}

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

@@ -0,0 +1,5 @@
+// import execMigrations from './funcs/exec.migrations.js';
+async function plugin() {
+    //   fastify.decorate('execMigrations', execMigrations);
+}
+export default plugin;

package/dist/server/routes/auth/controllers/2factor/generate.js

@@ -0,0 +1,38 @@
+import config from "../../../../../config.js";
+import pgClients from "../../../../plugins/pg/pgClients.js";
+import { generate } from "./providers/totp.js";
+/**
+ * Генерація secret для двохфакторної авторизації користувача
+ *
+ * @method GET
+ * @summary Генерація user secret для двохфакторної авторизації
+ * @priority 3
+ * @alias generate
+ * @type api
+ * @tag auth
+ * @requires 2fa
+ * @errors 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+export default async function generateFunction({ pg = pgClients.client, user = {} }, reply) {
+    if (!user?.uid) {
+        return reply.status(401).send("unauthorized");
+    }
+    const { uid } = user;
+    if (!config?.auth?.["2factor"]) {
+        return reply.status(400).send("2fa not enabled");
+    }
+    if (!config.pg) {
+        return reply.status(400).send("empty pg");
+    }
+    if (!uid) {
+        return reply.status(401).send("access restricted: unauthorized");
+    }
+    const res = await generate({ pg, uid });
+    if (res?.enabled) {
+        return reply.status(400).send("already created 2fa");
+    }
+    return reply.status(200).send(res);
+}

package/dist/server/routes/auth/controllers/2factor/toggle.js

@@ -0,0 +1,39 @@
+import config from '../../../../../config.js';
+import pgClients from '../../../../plugins/pg/pgClients.js';
+import { toggle } from './providers/totp.js';
+/**
+ * Включення/виключення двохфакторної авторизації для користувача
+ *
+ * @method GET
+ * @summary Включення/виключення двохфакторної авторизації
+ * @priority 2
+ * @alias toggle
+ * @type api
+ * @tag auth
+ * @requires 2fa
+ * @errors 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+export default async function toggleFunction(req, reply) {
+    const { pg = pgClients.client, session = {}, query = {}, } = req;
+    const { uid } = session?.passport?.user || {};
+    const { code, enable } = query;
+    if (!config.pg) {
+        return reply.status(400).send('empty pg');
+    }
+    if (!uid) {
+        return reply.status(401).send('access restricted: unauthorized');
+    }
+    if (!code) {
+        return reply.status(400).send('param "code" is required');
+    }
+    if (!Object.hasOwn(query, 'enable')) {
+        return reply.status(400).send('param "enable" is required');
+    }
+    const data = await toggle({
+        pg, code, enable: enable === 'true', uid,
+    });
+    return reply.status(200).send(data);
+}

package/dist/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -0,0 +1,22 @@
+import config from "../../../../../config.js";
+const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
+/**
+ *
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+export default function checkUserAccess({ user = {}, token, }) {
+    if (token && token === accessToken) {
+        return { message: "access granted", status: 200 };
+    }
+    // console.log(user);
+    if (!user.user_type?.includes?.("admin") &&
+        !config?.local &&
+        !config.auth?.disable) {
+        return { message: "access restricted", status: 403 };
+    }
+    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    } */
+    return { message: "access granted", status: 200 };
+}

package/dist/server/routes/logger/controllers/utils/getRootDir.js

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import fs from "node:fs";
+import path from "node:path";
+import config from "../../../../../config.js";
+// import { existsSync } from 'fs';
+let logDir = null;
+export default function getRootDir() {
+    // absolute / relative path
+    if (logDir)
+        return logDir;
+    const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
+    const root = file === "config.json" ? process.cwd() : "/data/local";
+    logDir = config.logDir || path.join(root, config.log?.dir || "log");
+    console.log({ logDir });
+    return logDir;
+    // windows debug support
+    /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+    // docker default path
+    if (existsSync(customLogDir)) {
+      return path.join(customLogDir, config.folder || '', 'log');
+    }
+  
+    // non-docker default path
+    return path.join(config.root || '/data/local', config.folder || '', 'log'); */
+}

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

@@ -40,7 +40,7 @@ addHook("onWidgetSet", onWidgetSet);
 const policy = "L0";
 const params = { config: { tags, policy }, schema: tableSchema };
 export default function route(app) {
-    app.get("/widget/:type/:entityType/:objectid", params, async (req) => {
+    app.get("/v2/widget/:type/:entityType/:objectid", params, async (req) => {
         const result = await widgetEntityGet({
             type: req.params.type,
             entityType: req.params.entityType,
@@ -51,7 +51,7 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.post("/widget/:type/:entityType/:objectid", params, async (req) => {
+    app.post("/v2/widget/:type/:entityType/:objectid", params, async (req) => {
         if (["gallery", "file"].includes(req.params.type) &&
             req.headers["content-type"]?.startsWith("multipart/form-data")) {
             const file = await uploadMultiPart(req);
@@ -74,7 +74,7 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.put("/widget/:type/:entityType/:objectid/:id", params, async (req) => {
+    app.put("/v2/widget/:type/:entityType/:objectid/:id", params, async (req) => {
         if (["gallery", "file"].includes(req.params.type) &&
             req.headers["content-type"]?.startsWith("multipart/form-data")) {
             const file = await uploadMultiPart(req);
@@ -99,7 +99,7 @@ export default function route(app) {
         }, req.pg);
         return result;
     });
-    app.delete("/widget/:type/:entityType/:objectid/:id", params, async (req) => {
+    app.delete("/v2/widget/:type/:entityType/:objectid/:id", params, async (req) => {
         const result = await widgetEntityDel({
             type: req.params.type,
             entityType: req.params.entityType,
@@ -111,8 +111,8 @@ export default function route(app) {
         return result;
     });
     app.get("/widget/:type/:objectid", params, widgetGet);
-    app.post("/widget/:type/:objectid", params, widgetSet);
-    app.put("/widget/:type/:objectid/:id", params, widgetSet);
+    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);
 }

package/dist/server/types/errors.d.ts

@@ -0,0 +1,14 @@
+import createError from "@fastify/error";
+export declare const NotFoundError: createError.FastifyErrorConstructor<{
+    code: "NOT_FOUND_ERROR";
+    statusCode: 404;
+}, [any?, any?, any?]>;
+export declare const BadRequestError: createError.FastifyErrorConstructor<{
+    code: "BAD_REQUEST_ERROR";
+    statusCode: 400;
+}, [any?, any?, any?]>;
+export declare const PayloadTooLargeError: createError.FastifyErrorConstructor<{
+    code: "PAYLOAD_TOO_LARGE_ERROR";
+    statusCode: 413;
+}, [any?, any?, any?]>;
+//# sourceMappingURL=errors.d.ts.map

package/dist/server/types/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../server/types/errors.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,eAAO,MAAM,aAAa;;;sBAIzB,CAAC;AACF,eAAO,MAAM,eAAe;;;sBAI3B,CAAC;AACF,eAAO,MAAM,oBAAoB;;;sBAIhC,CAAC"}

package/dist/server/types/errors.js

@@ -0,0 +1,4 @@
+import createError from "@fastify/error";
+export const NotFoundError = createError("NOT_FOUND_ERROR", "Resource not found: %s", 404);
+export const BadRequestError = createError("BAD_REQUEST_ERROR", "Bad request: %s", 400);
+export const PayloadTooLargeError = createError("PAYLOAD_TOO_LARGE_ERROR", "Payload Too Large: %s", 413);

package/package.json

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