@opengis/fastify-table 2.0.106 → 2.0.108

package/dist/server/plugins/util/funcs/unflattenObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/util/funcs/unflattenObject.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,OAAO,EAAE,GAAG,MA0CnD"}
+{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/util/funcs/unflattenObject.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,OAAO,EAAE,GAAG,MAkDnD"}

package/dist/server/plugins/util/funcs/unflattenObject.js

@@ -5,7 +5,9 @@
 export default function unflattenObject(flatObj) {
     const res = Object.keys(flatObj || {}).reduce((acc, key) => {
         const keys = key.split(".");
-        keys.reduce((nestedObj, part, index) => {
+        keys.reduce((nestedObj, part1, index) => {
+            // ! prevent npx vitest run from upper case -ing env variables
+            const part = process.env.VITEST ? part1.toLowerCase() : part1;
             if (index === keys.length - 1) {
                 // json array
                 if (typeof flatObj[key] === "string" &&
@@ -16,7 +18,7 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = JSON.parse(flatObj[key] || "{}");
                     }
                     catch (err) {
-                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        console.warn(`⚠️ Error parsing JSON for key ${key}:`, err.toString());
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }
@@ -27,7 +29,7 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = JSON.parse(flatObj[key] || "{}");
                     }
                     catch (err) {
-                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        console.warn(`⚠️ Error parsing JSON for key ${key}:`, err.toString());
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }

package/dist/server/routes/access/controllers/access.group.d.ts

@@ -8,7 +8,7 @@ export default function accessGroup({ pg, params, user, unittest, }: {
     user: Record<string, any>;
     unittest?: any;
 }, reply: FastifyReply): Promise<{
-    routes: any[];
-    users: any[];
+    routes: any;
+    users: any;
 }>;
 //# sourceMappingURL=access.group.d.ts.map

package/dist/server/routes/access/controllers/access.group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.group.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EAED,KAAK,EAAE,YAAY;;;GAgCpB"}
+{"version":3,"file":"access.group.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EAED,KAAK,EAAE,YAAY;;;GA+BpB"}

package/dist/server/routes/access/controllers/access.group.js

@@ -1,6 +1,5 @@
 import { pgClients, getAdminAccess } from "../../../../utils.js";
 export default async function accessGroup({ pg = pgClients.client, params, user = {}, unittest, }, reply) {
-    debugger;
     if (!params?.id) {
         return reply.status(400).send("not enough params: id");
     }

package/dist/server/routes/access/controllers/access.group.post.d.ts

@@ -9,7 +9,7 @@ export default function accessGroupPost({ pg, params, user, body, unittest, }: {
     body: Record<string, any>;
     unittest?: any;
 }, reply: FastifyReply): Promise<{
-    routes: any[];
-    users: any[];
+    routes: any;
+    users: any;
 }>;
 //# sourceMappingURL=access.group.post.d.ts.map

package/dist/server/routes/access/controllers/access.group.post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GA4FpB"}
+{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GA2FpB"}

package/dist/server/routes/access/controllers/access.group.post.js

@@ -12,7 +12,6 @@ export default async function accessGroupPost({ pg = pgClients.client, params, u
     }
     const { users = [], routes = [] } = body;
     if (!routes?.length) {
-        // return { message: 'not enough params: users / routes', status: 400 };
         await pg.query("delete from admin.role_access where role_id=$1", [id]);
         if (!users?.length) {
             return reply.status(200).send({ id, routes });

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;;;;;;;;;;;;EAyD3C,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;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"}

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

@@ -48,7 +48,7 @@ const generate = async ({ uid, pg }) => {
         .then((el) => el.rows?.[0] || {});
     const { sufix } = config.auth?.["2fa"] || {};
     if (sufix && !userData[sufix]) {
-        console.warn("2fa prefix not found at userData");
+        console.warn("⚠️ 2fa prefix not found at userData");
     }
     const otp = getOTP((sufix ? userData[sufix] : null) || userData.login || userData.code || uid, secret);
     const qrCodeAsImageSource = await qrcode.toDataURL(otp);

package/dist/server/routes/auth/controllers/core/registration.d.ts

@@ -17,7 +17,7 @@ import { FastifyReply } from "fastify";
  * @returns {String|Object} error Опис помилки
  * @returns {String|Object} message Повідомлення про успішну реєстрацію
  */
-export default function registration({ pg, body }: any, reply: FastifyReply): Promise<{
+export default function registration(req: any, reply: FastifyReply): Promise<{
     message: string;
     status: number;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAWvC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CACxC,EAAE,EAAqB,EAAE,IAAS,EAAE,EAAE,GAAG,EACzC,KAAK,EAAE,YAAY;;;GA4FpB"}
+{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAavC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CACxC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY;;;GA2HpB"}

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

@@ -1,9 +1,11 @@
 const q1 = 'select count(*) > 0 as "userExists" from admin.users where $1 in (email,login)';
 const q2 = 'select count(*) > 0 as "contactExists" from crm_acc.crm_contact where email=$1';
 const q3 = "select contact_id as uid from crm_acc.crm_contact where email=$1";
+const qUser = "select * from admin.users where email = $1 and enabled";
 import config from "../../../../../config.js";
 import dataInsert from "../../../../plugins/crud/funcs/dataInsert.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
+import authorizeUser from "../../../../plugins/auth/funcs/authorizeUser.js";
 /**
  * АПІ призначене для реєстрації нового користувача на сайті
  *
@@ -22,26 +24,42 @@ import pgClients from "../../../../plugins/pg/pgClients.js";
  * @returns {String|Object} error Опис помилки
  * @returns {String|Object} message Повідомлення про успішну реєстрацію
  */
-export default async function registration({ pg = pgClients.client, body = {} }, reply) {
+export default async function registration(req, reply) {
+    const { pg = pgClients.client, body = {} } = req;
     const { password, email } = body;
     if (!password || (!email && !body.login)) {
-        return { message: "Недостатньо параметрів", status: 400 };
+        return reply.status(400).send({
+            error: "Недостатньо параметрів",
+            code: 400,
+        });
     }
     const regularExp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
     if (email && !regularExp.test(email)) {
-        return { message: "Параметр E-mail невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр E-mail невалідний",
+            code: 400,
+        });
     }
     if (body?.first_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.first_name)) {
-        return { message: "Параметр Ім'я невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Ім'я невалідний",
+            code: 400,
+        });
     }
     if (body?.last_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.last_name)) {
-        return { message: "Параметр Прізвище невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Прізвище невалідний",
+            code: 400,
+        });
     }
     if (body?.phone &&
         !/^\+\d{3}\s?\d{2}\s?\d{3}\s?\d{2}\s?\d{2}$/.test(body?.phone)) {
-        return { message: "Параметр Телефон невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Телефон невалідний",
+            code: 400,
+        });
     }
     const login = body.login || email;
     const data = {
@@ -63,7 +81,7 @@ export default async function registration({ pg = pgClients.client, body = {} },
         const txt = !body.login
             ? "Даний адрес електронної пошти вже прив'язаний до іншого облікового запису"
             : "Даний логін вже використовується";
-        return { message: txt, status: 409 };
+        return reply.status(409).send({ error: txt, code: 409 });
     }
     if (pg.pk?.["crm_acc.crm_contact"]) {
         // insert crm contact
@@ -74,7 +92,7 @@ export default async function registration({ pg = pgClients.client, body = {} },
             const txt = !body.login
                 ? "Користувача за даною адресою вже зареєстровано"
                 : "Даний логін вже використовується";
-            return { message: txt, status: 409 };
+            return reply.status(409).send({ error: txt, code: 409 });
         }
         await dataInsert({ pg, table: "crm_acc.crm_contact", data });
         const { uid } = await pg
@@ -92,5 +110,15 @@ export default async function registration({ pg = pgClients.client, body = {} },
             data,
         });
     }
-    return reply.redirect("/login");
+    const newUser = await pg
+        .query(qUser, [login])
+        .then((res) => res.rows?.[0]);
+    if (!newUser) {
+        return { message: "Помилка завершення реєстрації, спробуйте увійти", status: 500 };
+    }
+    const authType = "creds-" + (newUser.user_type === "admin" ? "admin" : "user");
+    const result = await authorizeUser(newUser, req, authType);
+    return req.method === "GET"
+        ? reply.status(302).redirect(result)
+        : reply.status(200).send(result);
 }

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

@@ -3,7 +3,7 @@ import dataUpdate from "../../../../plugins/crud/funcs/dataUpdate.js";
 export default async function updateUserInfo(req, reply) {
     const { body: payload, pg = pgClients.client } = req;
     if (!req.user?.uid) {
-        return reply.code(401).send({ message: "Unauthorized", code: 401 });
+        return reply.code(401).send({ error: "Unauthorized", code: 401 });
     }
     const userInfo = Object.fromEntries(Object.entries(payload || {}).filter(([key]) => !["salt", "user_type"].includes(key)));
     const result = await dataUpdate({

package/dist/server/routes/auth/controllers/jwt/authorize.js

@@ -19,12 +19,12 @@ export default async function authorize(req, reply) {
     if (response_type !== "code") {
         return reply
             .code(400)
-            .send({ message: "unsupported response_type", code: 400 });
+            .send({ error: "unsupported response_type", code: 400 });
     }
     if (!client_id) {
         return reply
             .code(400)
-            .send({ message: "not enough query params: client_id", code: 400 });
+            .send({ error: "not enough query params: client_id", code: 400 });
     }
     const q = `select owner_user_id, client_secret_hash, redirect_uris from oauth.clients where client_id=$1 and token_endpoint_auth_method=$2 and ${scope ? "$1=any(scopes)" : "1=1"}`;
     const { owner_user_id: userId, client_secret_hash: secret, redirect_uris = [], } = pg.pk?.["oauth.clients"]
@@ -33,12 +33,12 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows?.[0] || {})
         : {};
     if (!userId) {
-        return reply.code(400).send({ message: "invalid client id", code: 400 });
+        return reply.code(400).send({ error: "invalid client id", code: 400 });
     }
     if (redirect_uri &&
         Array.isArray(redirect_uris) &&
         !redirect_uris.includes(redirect_uri)) {
-        return reply.code(400).send({ message: "invalid redirect_uri", code: 400 });
+        return reply.code(400).send({ error: "invalid redirect_uri", code: 400 });
     }
     const user = pg.pk?.["admin.users"]
         ? await pg
@@ -48,7 +48,7 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows[0])
         : null;
     if (!user) {
-        return reply.code(404).send({ message: "user not found", code: 404 });
+        return reply.code(404).send({ error: "user not found", code: 404 });
     }
     const href1 = await authorizeUser(user, req, "jwt", expireMsec);
     // Generate authorization code

package/dist/server/routes/auth/controllers/jwt/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAmB5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAqHpB"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAmB5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAmHpB"}

package/dist/server/routes/auth/controllers/jwt/token.js

@@ -14,19 +14,17 @@ export default async function oauthToken(req, reply) {
     const payload = req.method === "POST" ? body : query;
     const { grant_type, client_id, code, redirect_uri, code_verifier } = payload;
     if (grant_type !== "authorization_code") {
-        return reply
-            .code(400)
-            .send({ message: "unsupported grant_type", code: 400 });
+        return reply.code(400).send({ error: "unsupported grant_type", code: 400 });
     }
     if (!client_id) {
         return reply
             .code(400)
-            .send({ message: "not enough params: client_id", code: 400 });
+            .send({ error: "not enough params: client_id", code: 400 });
     }
     if (!code) {
         return reply
             .code(400)
-            .send({ message: "not enough params: code", code: 400 });
+            .send({ error: "not enough params: code", code: 400 });
     }
     const q = `select owner_user_id, client_secret_hash, redirect_uris from oauth.clients where client_id=$1 and token_endpoint_auth_method=$2`;
     const { owner_user_id: userId, client_secret_hash: secret, redirect_uris = [], } = pg.pk?.["oauth.clients"]
@@ -41,31 +39,31 @@ export default async function oauthToken(req, reply) {
     if (storedIp !== ip) {
         return reply
             .code(403)
-            .send({ message: "access restricted: wrong IP address", code: 403 });
+            .send({ error: "access restricted: wrong IP address", code: 403 });
     }
     if (!stored) {
         return reply
             .code(403)
-            .send({ message: "access restricted: code expired", code: 403 });
+            .send({ error: "access restricted: code expired", code: 403 });
     }
     const isValid = await scryptVerify(stored, code);
     if (!isValid) {
         return reply
             .code(403)
-            .send({ message: "access restricted: stored code mismatch", code: 403 });
+            .send({ error: "access restricted: stored code mismatch", code: 403 });
     }
     if (!isCodeValid) {
         return reply
             .code(403)
-            .send({ message: "access restricted: invalid code", code: 403 });
+            .send({ error: "access restricted: invalid code", code: 403 });
     }
     if (!userId) {
-        return reply.code(400).send({ message: "invalid client id", code: 400 });
+        return reply.code(400).send({ error: "invalid client id", code: 400 });
     }
     if (redirect_uri &&
         Array.isArray(redirect_uris) &&
         !redirect_uris.includes(redirect_uri)) {
-        return reply.code(400).send({ message: "invalid redirect_uri", code: 400 });
+        return reply.code(400).send({ error: "invalid redirect_uri", code: 400 });
     }
     const user = pg.pk?.["admin.users"]
         ? await pg
@@ -75,7 +73,7 @@ export default async function oauthToken(req, reply) {
             .then((el) => el.rows[0])
         : null;
     if (!user) {
-        return reply.code(404).send({ message: "user not found", code: 404 });
+        return reply.code(404).send({ error: "user not found", code: 404 });
     }
     const expire = expires_at ? expires_at - Date.now() : expireMsec;
     const href1 = await authorizeUser(user, req, "jwt", expire);

package/dist/server/routes/cron/controllers/cronApi.d.ts

@@ -1,2 +1,2 @@
-export default function cronApi(req: any): Promise<any>;
+export default function cronApi(req: any, reply: any): Promise<any>;
 //# sourceMappingURL=cronApi.d.ts.map

package/dist/server/routes/cron/controllers/cronApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cronApi.d.ts","sourceRoot":"","sources":["../../../../../server/routes/cron/controllers/cronApi.ts"],"names":[],"mappings":"AAEA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAoB7C"}
+{"version":3,"file":"cronApi.d.ts","sourceRoot":"","sources":["../../../../../server/routes/cron/controllers/cronApi.ts"],"names":[],"mappings":"AAEA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsBzD"}

package/dist/server/routes/cron/controllers/cronApi.js

@@ -1,15 +1,17 @@
 import cronList from "../../../plugins/cron/cronList.js";
-export default async function cronApi(req) {
+export default async function cronApi(req, reply) {
     const { params = {}, user = {}, hostname } = req;
     if ((!user.uid || !user.user_type?.includes("admin")) &&
         !hostname?.includes("local")) {
-        return { message: "access restricted", status: 403 };
+        return reply.status(403).send({ error: "access restricted", code: 403 });
     }
     if (params.name === "list") {
         return { data: Object.keys(cronList || {}) };
     }
     if (!cronList[params.name]) {
-        return { message: `cron not found: ${params.name}`, status: 404 };
+        return reply
+            .status(404)
+            .send({ error: `cron not found: ${params.name}`, code: 404 });
     }
     const result = await cronList[params.name]?.(req);
     return result;

package/dist/server/routes/crud/controllers/insert.d.ts

@@ -1,6 +1,3 @@
 import { type FastifyReply } from "fastify";
-export default function insert(req: any, reply: FastifyReply): Promise<{
-    message: string;
-    status: number;
-}>;
+export default function insert(req: any, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=insert.d.ts.map

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAgB5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;GAsKjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAgB5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4KjE"}

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

@@ -2,7 +2,7 @@ import { applyHook, getAccess, getTemplate, checkXSS, checkSQL, dataInsert, getT
 export default async function insert(req, reply) {
     const { pg = pgClients.client, user = {}, params = {}, body = {}, headers = {}, } = req || {};
     if (!user) {
-        return reply.status(403).send("access restricted");
+        return reply.status(403).send({ error: "access restricted", code: 403 });
     }
     const hookData = (await applyHook("preInsert", {
         pg,
@@ -11,7 +11,10 @@ export default async function insert(req, reply) {
         body,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     const { referer } = headers;
     const tokenData = await getToken({
@@ -30,18 +33,20 @@ export default async function insert(req, reply) {
         !config.local &&
         !config.security?.disableToken &&
         !config.auth?.disable) {
-        return reply.status(400).send("invalid token");
+        return reply.status(400).send({ error: "invalid token", code: 400 });
     }
     if (!actions.includes("add") && !config.local && !tokenData) {
-        return reply.status(403).send("access restricted: actions");
+        return reply
+            .status(403)
+            .send({ error: "access restricted: actions", code: 403 });
     }
     if (!add) {
-        return reply.status(400).send("table is required");
+        return reply.status(400).send({ error: "table is required", code: 400 });
     }
     const loadTemplate = await getTemplate("table", add);
     const { table } = loadTemplate || hookData || tokenData || req.params || {};
     if (!table) {
-        return reply.status(404).send("table not found");
+        return reply.status(404).send({ error: "table not found", code: 404 });
     }
     const formData = form || loadTemplate?.form
         ? (await getTemplate("form", form || loadTemplate?.form)) || {}
@@ -56,9 +61,10 @@ export default async function insert(req, reply) {
             uid: user?.uid,
             msg: xssCheck.error,
         });
-        return reply
-            .status(409)
-            .send("Дані містять заборонені символи. Приберіть їх та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані містять заборонені символи. Приберіть їх та спробуйте ще раз",
+            code: 409,
+        });
     }
     const fieldCheck = validateData({ body, schema });
     if (fieldCheck.error) {
@@ -68,9 +74,10 @@ export default async function insert(req, reply) {
             uid: user?.uid,
             ...fieldCheck,
         });
-        return reply
-            .status(409)
-            .send("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз",
+            code: 409,
+        });
     }
     const sqlCheck = checkSQL({ body, schema });
     if (sqlCheck.error) {
@@ -80,9 +87,10 @@ export default async function insert(req, reply) {
             uid: user?.uid,
             ...sqlCheck,
         });
-        return reply
-            .status(409)
-            .send("Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз",
+            code: 409,
+        });
     }
     if (![add, table].includes("admin.users")) {
         Object.assign(body, { uid: user?.uid, editor_id: user?.uid });
@@ -104,7 +112,7 @@ export default async function insert(req, reply) {
         referer,
     });
     if (!res) {
-        return reply.status(400).send("nothing added");
+        return reply.status(400).send({ error: "nothing added", code: 400 });
     }
     // admin.custom_column
     await applyHook("afterInsert", {

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;AAe5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBA0NZ"}
+{"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;AAe5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAkOZ"}

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

@@ -22,14 +22,15 @@ export default async function tableAPI(req, reply, called) {
     if (!loadTable &&
         !pg.pk?.[tokenData?.table] &&
         !(pg.pk?.[templateName] && called)) {
-        return reply.status(404).send("not found");
+        return reply.status(404).send({ error: "not found", code: 404 });
     }
     const { table: table1 = params.table, form: form1, obj, } = hookData || loadTable || tokenData || {};
     const table = loadTable?.table || table1;
     const form = loadTable?.form || form1;
     const id = hookData?.id || tokenData?.id || params.id;
-    if (tokenData && !id)
-        return { message: {} };
+    if (tokenData && !id) {
+        return reply.status(403).send({ error: "invalid token", code: 403 });
+    }
     if (!table && !id) {
         return reply.status(400).send("not enough params");
     }
@@ -46,14 +47,18 @@ export default async function tableAPI(req, reply, called) {
         return reply.status(400).send("invalid token");
     }
     if (!actions.includes("edit") && !config?.local && !tokenData && !called) {
-        return reply.status(403).send("access restricted: actions");
+        return reply
+            .status(403)
+            .send({ error: "access restricted: actions", code: 403 });
     }
     const { pk, columns: dbColumns = [] } = await getMeta({
         pg,
         table,
     });
     if (!pk) {
-        return reply.status(404).send(`table not found: ${table}`);
+        return reply
+            .status(404)
+            .send({ error: `table not found: ${table}`, code: 404 });
     }
     // const cols = columns.map((el) => el.name || el).join(',');
     const formData = (await getTemplate("form", form)) || {};
@@ -107,7 +112,9 @@ export default async function tableAPI(req, reply, called) {
         .query(q.replace(/{{uid}}/, user?.uid), [id])
         .then((el) => el.rows[0]);
     if (!data) {
-        return reply.status(404).send(`object not found: ${id}`);
+        return reply
+            .status(404)
+            .send({ error: `object not found: ${id}`, code: 404 });
     }
     Object.keys(schema)
         .filter((key) => schema[key]?.type === "DataTable")

package/dist/server/routes/crud/controllers/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsLxD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA4LxD"}

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

@@ -4,7 +4,7 @@ import insert from "./insert.js";
 export default async function update(req, reply) {
     const { pg = pgClients.client, user, params = {}, body = {}, headers = {}, unittest, } = req;
     if (!user) {
-        return reply.status(403).send("access restricted");
+        return reply.status(403).send({ error: "access restricted", code: 403 });
     }
     const hookData = (await applyHook("preUpdate", {
         pg,
@@ -13,7 +13,10 @@ export default async function update(req, reply) {
         user,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     const { referer } = headers;
     const tokenData = await getToken({
@@ -37,19 +40,21 @@ export default async function update(req, reply) {
         !config.local &&
         !config.security?.disableToken &&
         !config.auth?.disable) {
-        return reply.status(400).send("invalid token");
+        return reply.status(400).send({ error: "invalid token", code: 400 });
     }
     if (!actions.includes("edit") && !config.local && !tokenData) {
-        return reply.status(403).send("access restricted: actions");
+        return reply
+            .status(403)
+            .send({ error: "access restricted: actions", code: 403 });
     }
     if (!edit) {
-        return reply.status(400).send("table is required");
+        return reply.status(400).send({ error: "table is required", code: 400 });
     }
     if (!id && tokenData?.table) {
         return insert(req, reply);
     }
     if (!id) {
-        return reply.status(400).send("id is required");
+        return reply.status(400).send({ error: "id is required", code: 400 });
     }
     const loadTemplate = await getTemplate("table", edit);
     const { table } = loadTemplate || hookData || tokenData || params || {};
@@ -69,9 +74,10 @@ export default async function update(req, reply) {
     const xssCheck = checkXSS({ body, schema });
     if (xssCheck.error && formData?.xssCheck !== false) {
         logger.file("injection/xss", { msg: xssCheck.error, table }, req);
-        return reply
-            .status(409)
-            .send("Дані містять заборонені символи. Приберіть їх та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані містять заборонені символи. Приберіть їх та спробуйте ще раз",
+            code: 409,
+        });
     }
     const fieldCheck = validateData({ body, schema });
     if (fieldCheck.error) {
@@ -81,9 +87,10 @@ export default async function update(req, reply) {
             uid: user?.uid,
             ...fieldCheck,
         });
-        return reply
-            .status(409)
-            .send("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз",
+            code: 409,
+        });
     }
     const sqlCheck = checkSQL({ body, schema });
     if (sqlCheck.error) {
@@ -93,9 +100,10 @@ export default async function update(req, reply) {
             uid: user?.uid,
             ...sqlCheck,
         });
-        return reply
-            .status(409)
-            .send("Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз");
+        return reply.status(409).send({
+            error: "Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз",
+            code: 409,
+        });
     }
     if (tokenData?.obj) {
         const objData = tokenData.obj?.split("#").reduce((p, el) => ({