@opengis/fastify-table 2.3.5 → 2.4.0

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

@@ -5,14 +5,18 @@ import accessUserPost from "./controllers/access.user.post.js";
 import accessInterface from "./controllers/access.interface.js";
 import { publicResourcesList } from "../../plugins/access/funcs/getResources.js";
 import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema, accessUserPostSchema, accessUserSchema, } from "./schema.js";
+const tags = ["core", "access"];
 export default async function route(fastify, opt = {}) {
-    fastify.get("/access-group/:id", { schema: accessGroupSchema }, accessGroup);
-    fastify.post("/access-group/:id", { schema: accessGroupPostSchema }, accessGroupPost);
-    fastify.get("/access-user/:id", { config: { permission: "admin.users.read" }, schema: accessUserSchema }, accessUser);
+    fastify.get("/access-group/:id", { config: { tags }, schema: accessGroupSchema }, accessGroup);
+    fastify.post("/access-group/:id", { config: { tags }, schema: accessGroupPostSchema }, accessGroupPost);
+    fastify.get("/access-user/:id", {
+        config: { tags, permission: "admin.users.read" },
+        schema: accessUserSchema,
+    }, accessUser);
     fastify.post("/access-user/:id", {
-        config: { permission: "admin.users.update" },
+        config: { tags, permission: "admin.users.update" },
         schema: accessUserPostSchema,
     }, accessUserPost);
-    fastify.get("/access-interface/:name", { schema: accessInterfaceSchema }, accessInterface);
-    fastify.get("/resources", { config: { policy: "L0" } }, async () => publicResourcesList);
+    fastify.get("/access-interface/:name", { config: { tags }, schema: accessInterfaceSchema }, accessInterface);
+    fastify.get("/resources", { config: { tags, policy: "L0" } }, async () => publicResourcesList);
 }

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;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"}
+{"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;AAW1D,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

@@ -2,6 +2,7 @@ import crypto from "node:crypto";
 import qrcode from "qrcode";
 import * as authenticator from "otplib";
 import config from "../../../../../../config.js";
+import { BadRequestError, ForbiddenError } from "../../../../../../errors.js";
 const TYPE = "TOTP";
 // 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"
@@ -87,12 +88,12 @@ const verify = async ({ uid, code: token, pg }) => {
     const { secret, enabled, recoveryCodes } = await getSecret({ uid, pg });
     // console.debug('secret', secret, 'enabled', enabled, 'verification', 'token', authenticator.generate(secret), authenticator.verify({ token: authenticator.generate(secret), secret }));
     if (!secret) {
-        throw new Error("Включіть двофакторну аутентифікацію");
+        throw new BadRequestError("Включіть двофакторну аутентифікацію");
     }
     const isValid = authenticator.verify({ token, secret }) ||
         recoveryCodes.reduce((result, recoveryCode) => result || recoveryCode === token, false);
     if (!isValid) {
-        throw new Error("Невірний код");
+        throw new ForbiddenError("Невірний код");
     }
     return { enabled, recoveryCodes };
 };
@@ -106,7 +107,7 @@ const toggle = async ({ uid, code, pg, enable }) => {
         pg,
     });
     if (enabled === enable) {
-        throw new Error("Вже знаходиться у даному стані");
+        throw new BadRequestError("Вже знаходиться у даному стані");
     }
     if (enable) {
         await enableSecret({

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

@@ -1 +1 @@
-{"version":3,"file":"qrcode.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/qrcode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAa5D,wBAA8B,MAAM,CAClC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAoDpB"}
+{"version":3,"file":"qrcode.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/qrcode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAkB5D,wBAA8B,MAAM,CAClC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAiDpB"}

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

@@ -2,6 +2,7 @@ import qr from "qrcode";
 import config from "../../../../../config.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
 import { getSecret, generate } from "./providers/totp.js";
+import { BadRequestError, NotFoundError, UnauthorizedError, } from "../../../../../errors.js";
 const headers = {
     "Content-Type": "image/png",
 };
@@ -9,19 +10,16 @@ export default async function qrCode(req, reply) {
     const { pg = pgClients.client } = req;
     const { uid } = req.user || {};
     if (!uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (!pg || !pg?.pk?.["admin.users"] || !pg?.pk?.["admin.users_social_auth"]) {
-        return reply.status(400).send({
-            error: "db connection / users/users_social_auth tables are required",
-            code: 400,
-        });
+        throw BadRequestError("db connection / users/users_social_auth tables are required");
     }
     const userExists = await pg
         .query(`select uid from admin.users where uid=$1`, [uid])
         .then((el) => el.rows?.[0]?.uid);
     if (!userExists) {
-        return reply.status(404).send({ error: "invalid user", code: 404 });
+        throw NotFoundError("invalid user");
     }
     const { enabled, secret } = await getSecret({ pg, uid });
     const { otp } = secret
@@ -32,12 +30,10 @@ export default async function qrCode(req, reply) {
         : await generate({ uid, pg });
     const base64 = otp ? await qr.toDataURL(otp) : undefined;
     if (enabled && !config.local && !config.debug) {
-        return reply
-            .status(400)
-            .send({ error: "2factor already enabled", code: 400 });
+        throw BadRequestError("2factor already enabled");
     }
     if (!otp || !base64) {
-        return reply.status(500).send({ error: "generation error", code: 500 });
+        throw Error("generation error");
     }
     // substring to exclude data:image/png;base64,
     return reply

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

@@ -1 +1 @@
-{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAqFnE"}
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAsBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4EnE"}

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

@@ -7,6 +7,7 @@ import pgClients from "../../../../plugins/pg/pgClients.js";
 import { handlebars } from "../../../../helpers/index.js";
 import { verify, deleteSecret } from "./providers/totp.js";
 import sendNotification from "../../../../plugins/auth/funcs/sendNotification.js";
+import { BadRequestError, NotFoundError, UnauthorizedError, } from "../../../../../errors.js";
 const template = "recovery-codes-email-template";
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 /**
@@ -29,23 +30,20 @@ const dirname = path.dirname(fileURLToPath(import.meta.url));
 export default async function recovery(req, reply) {
     const { pg = pgClients.client, user, body = {}, method } = req;
     if (!user?.uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (!user.twofa) {
-        return reply.status(400).send({ error: "2fa not enabled", code: 400 });
+        throw BadRequestError("2fa not enabled");
     }
     if (!config.pg) {
-        return reply.status(400).send({ error: "empty pg", code: 400 });
+        throw Error("empty pg");
     }
     const { code } = body;
     const { uid, email } = user || {};
     if (!code) {
         if (!email) {
-            return reply
-                .status(404)
-                .send({ error: "user recovery email not set", code: 404 });
+            throw NotFoundError("user recovery email not set");
         }
-        // return reply.status(400).send('not enough params');
         const customPt = await getTemplate("pt", template);
         const pt = customPt ||
             (await readFile(path.join(dirname, `../../../../../templates/pt/${template}.html`), "utf8"));
@@ -54,9 +52,7 @@ export default async function recovery(req, reply) {
       where uid = $1 and social_auth_type = $2`, [uid, "TOTP"])
             .then((el) => el.rows?.[0]?.recoveryCodes || []);
         if (!recoveryCodes?.length) {
-            return reply
-                .status(404)
-                .send({ error: "user recovery code not found", code: 404 });
+            throw NotFoundError("user recovery code not found");
         }
         const html = await handlebars.compile(pt)({
             recoveryCodes: [recoveryCodes[0]],
@@ -74,18 +70,13 @@ export default async function recovery(req, reply) {
         }
         return reply.redirect("/2factor?recovery=1");
     }
-    try {
-        // validate recovery code
-        await verify({ uid, code, pg });
-        // delete old secret
-        await deleteSecret({ pg, uid });
-        const redirectUrl = config.auth?.link?.["2fa"]?.login || "/2factor";
-        if (method === "POST") {
-            return reply.status(200).send({ redirectUrl });
-        }
-        return reply.redirect(redirectUrl);
-    }
-    catch (err) {
-        return reply.status(500).send({ error: err.toString(), code: 500 });
+    // validate recovery code
+    await verify({ uid, code, pg });
+    // delete old secret
+    await deleteSecret({ pg, uid });
+    const redirectUrl = config.auth?.link?.["2fa"]?.login || "/2factor";
+    if (method === "POST") {
+        return reply.status(200).send({ redirectUrl });
     }
+    return reply.redirect(redirectUrl);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOvC,wBAA8B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAiBhE"}
+{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQvC,wBAA8B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAchE"}

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

@@ -1,16 +1,14 @@
 import config from "../../../../../config.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
 import { deleteSecret } from "./providers/totp.js";
+import { BadRequestError } from "../../../../../errors.js";
 export default async function reset(req, reply) {
     const { pg = pgClients.client, query } = req;
     if (!query?.uid) {
-        return reply.status(400).send({
-            error: "not enough query params: uid",
-            code: 400,
-        });
+        throw BadRequestError("not enough query params: uid");
     }
     if (!config.pg) {
-        return reply.status(400).send({ error: "empty pg", code: 400 });
+        throw Error("empty pg");
     }
     await deleteSecret({ pg, uid: query.uid });
     return reply.status(200).send({ ok: true });

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

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0BvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAwEzE"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA2BvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAyDzE"}

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

@@ -7,6 +7,7 @@ import pgClients from "../../../../plugins/pg/pgClients.js";
 import { handlebars } from "../../../../helpers/index.js";
 import { verify, enableSecret } from "./providers/totp.js";
 import sendNotification from "../../../../plugins/auth/funcs/sendNotification.js";
+import { BadRequestError } from "../../../../../errors.js";
 const template = "recovery-codes-email-template";
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const defaultPt = existsSync(path.join(dirname, `../../../../templates/pt/${template}.hbs`))
@@ -34,54 +35,40 @@ export default async function verifyFunction(req, reply) {
     const { uid, twofa, email } = user || {};
     const { code } = body;
     if (!twofa) {
-        return reply.status(400).send({ error: "2fa not enabled", code: 400 });
+        throw BadRequestError("2fa not enabled");
     }
     if (!config.pg) {
-        return reply.status(400).send({ error: "empty pg", code: 400 });
+        throw Error("empty pg");
     }
     if (!code) {
-        return reply
-            .status(400)
-            .send({ error: "not enough body params: code", code: 400 });
+        throw BadRequestError("not enough body params: code");
     }
-    try {
-        const { enabled } = await verify({ uid, code, pg });
-        await enableSecret({ pg, uid });
-        req.session.secondFactorPassed = true;
-        if (!enabled && email) {
-            const { recoveryCodes } = await pg
-                .query(`select social_auth_obj->'codesArray' as "recoveryCodes" 
+    const { enabled } = await verify({ uid, code, pg });
+    await enableSecret({ pg, uid });
+    req.session.secondFactorPassed = true;
+    if (!enabled && email) {
+        const { recoveryCodes } = await pg
+            .query(`select social_auth_obj->'codesArray' as "recoveryCodes" 
       from admin.users_social_auth where uid=$1 and social_auth_type='TOTP'`, [uid])
-                ?.then((el) => el.rows?.[0] || {});
-            const customPt = await getTemplate("pt", template);
-            const pt = customPt || defaultPt;
-            const html = await handlebars.compile(pt)({
-                recoveryCodes,
-                code: recoveryCodes,
-                domain: `${req.protocol || "https"}://${req.hostname}`,
-            });
-            await sendNotification({
-                pg,
-                to: email,
-                template: html,
-                title: `Recovery codes for ${req.hostname} 2-factor authentication`,
-                nocache: config.local || config.debug || user?.user_type?.includes?.("admin"),
-            });
-        }
-        const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
-        // return reply.redirect(redirectUrl.startsWith("/") ? redirectUrl : "/");
-        return reply
-            .status(200)
-            .send({ redirectUrl: redirectUrl.startsWith("/") ? redirectUrl : "/" });
-    }
-    catch (err) {
-        if ([
-            "Невірний код",
-            "Вже знаходиться у даному стані",
-            "Включіть двофакторну аутентифікацію",
-        ].includes(err.message)) {
-            return reply.status(400).send({ error: err.message, code: 400 });
-        }
-        return reply.status(500).send(err.toString());
+            ?.then((el) => el.rows?.[0] || {});
+        const customPt = await getTemplate("pt", template);
+        const pt = customPt || defaultPt;
+        const html = await handlebars.compile(pt)({
+            recoveryCodes,
+            code: recoveryCodes,
+            domain: `${req.protocol || "https"}://${req.hostname}`,
+        });
+        await sendNotification({
+            pg,
+            to: email,
+            template: html,
+            title: `Recovery codes for ${req.hostname} 2-factor authentication`,
+            nocache: config.local || config.debug || user?.user_type?.includes?.("admin"),
+        });
     }
+    const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
+    // return reply.redirect(redirectUrl.startsWith("/") ? redirectUrl : "/");
+    return reply
+        .status(200)
+        .send({ redirectUrl: redirectUrl.startsWith("/") ? redirectUrl : "/" });
 }

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

@@ -6,8 +6,5 @@ import { FastifyReply } from "fastify";
  * @summary Авторизація користувача за логіном і паролем
  *
  */
-export default function login(req: any, reply: FastifyReply): Promise<{
-    error: string;
-    status: number;
-}>;
+export default function login(req: any, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=login.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/login.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC;;;;;;GAMG;AAEH,wBAA8B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;GAUhE"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/login.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC;;;;;;GAMG;AAEH,wBAA8B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAUhE"}

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

@@ -1 +1 @@
-{"version":3,"file":"passwordRecovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/passwordRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoCvC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAmI3E"}
+{"version":3,"file":"passwordRecovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/passwordRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAqCvC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAiI3E"}

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

@@ -8,6 +8,7 @@ import logger from "../../../../plugins/logger/getLogger.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
 import getTemplate from "../../../../plugins/table/funcs/getTemplate.js";
 import sendNotification from "../../../../plugins/auth/funcs/sendNotification.js";
+import { BadRequestError } from "../../../../../errors.js";
 const rclient = getRedis();
 const template = "recovery-password-email-template";
 const dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -48,10 +49,10 @@ export default async function passwordRecovery(req, reply) {
     const { pg = pgClients.client, query = {}, body = {}, hostname, unittest, } = req;
     const { nocache = config.local } = query;
     if (!query.code && !body.email) {
-        return reply.status(400).send('Parameter "email" is required.');
+        throw BadRequestError('Parameter "email" is required.');
     }
     if (query.code && !body.password) {
-        return reply.status(400).send('Param "password" is required.');
+        throw BadRequestError('Param "password" is required.');
     }
     // step 1 - send email code
     async function sendEmailToChangePassword() {
@@ -71,9 +72,7 @@ export default async function passwordRecovery(req, reply) {
             ? await rclient.get(keyCacheTimeout)
             : false;
         if (checkCodeTimeout && !nocache) {
-            return reply
-                .status(400)
-                .send(`Код вже відправлено на пошту ${body.email}. Перевірте або спробуйте через 1 хвилину`);
+            throw BadRequestError(`Код вже відправлено на пошту ${body.email}. Перевірте або спробуйте через 1 хвилину`);
         }
         const q = "update admin.users set user_personal_code=$1 where $2 in (login,email)";
         if (config.pg) {
@@ -81,11 +80,11 @@ export default async function passwordRecovery(req, reply) {
         }
         const userQuery = `select coalesce(sur_name,'')|| coalesce(' '||user_name,'')||coalesce(' '||father_name,'') as user 
     from admin.users where $1 in (login,email) limit 1`;
-        const { user: userName } = config.pg
+        const userName = config.pg
             ? await pg
                 .query(userQuery, [body.email])
-                .then((el) => el.rows?.[0] || {})
-            : {};
+                .then((el) => el.rows?.[0]?.user)
+            : null;
         try {
             const customPt = await getTemplate("pt", template);
             const pt = customPt ||

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

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

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;AAavC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CACxC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY;;;GA2HpB"}
+{"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;AAcvC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4GvE"}

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

@@ -6,6 +6,7 @@ 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";
+import { BadRequestError, ConflictError } from "../../../../../errors.js";
 /**
  * АПІ призначене для реєстрації нового користувача на сайті
  *
@@ -28,38 +29,23 @@ export default async function registration(req, reply) {
     const { pg = pgClients.client, body = {} } = req;
     const { password, email } = body;
     if (!password || (!email && !body.login)) {
-        return reply.status(400).send({
-            error: "Недостатньо параметрів",
-            code: 400,
-        });
+        throw BadRequestError("Недостатньо параметрів");
     }
     const regularExp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
     if (email && !regularExp.test(email)) {
-        return reply.status(400).send({
-            error: "Параметр E-mail невалідний",
-            code: 400,
-        });
+        throw BadRequestError("Параметр E-mail невалідний");
     }
     if (body?.first_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.first_name)) {
-        return reply.status(400).send({
-            error: "Параметр Ім'я невалідний",
-            code: 400,
-        });
+        throw BadRequestError("Параметр Ім'я невалідний");
     }
     if (body?.last_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.last_name)) {
-        return reply.status(400).send({
-            error: "Параметр Прізвище невалідний",
-            code: 400,
-        });
+        throw BadRequestError("Параметр Прізвище невалідний");
     }
     if (body?.phone &&
         !/^\+\d{3}\s?\d{2}\s?\d{3}\s?\d{2}\s?\d{2}$/.test(body?.phone)) {
-        return reply.status(400).send({
-            error: "Параметр Телефон невалідний",
-            code: 400,
-        });
+        throw BadRequestError("Параметр Телефон невалідний");
     }
     const login = body.login || email;
     const data = {
@@ -76,12 +62,12 @@ export default async function registration(req, reply) {
     };
     const { userExists } = config.pg
         ? await pg.query(q1, [login]).then((el) => el.rows?.[0] || {})
-        : {};
+        : { userExists: false };
     if (userExists) {
         const txt = !body.login
             ? "Даний адрес електронної пошти вже прив'язаний до іншого облікового запису"
             : "Даний логін вже використовується";
-        return reply.status(409).send({ error: txt, code: 409 });
+        throw ConflictError(txt);
     }
     if (pg.pk?.["crm_acc.crm_contact"]) {
         // insert crm contact
@@ -92,7 +78,7 @@ export default async function registration(req, reply) {
             const txt = !body.login
                 ? "Користувача за даною адресою вже зареєстровано"
                 : "Даний логін вже використовується";
-            return reply.status(409).send({ error: txt, code: 409 });
+            throw ConflictError(txt);
         }
         await dataInsert({ pg, table: "crm_acc.crm_contact", data });
         const { uid } = await pg
@@ -114,7 +100,7 @@ export default async function registration(req, reply) {
         .query(qUser, [login])
         .then((res) => res.rows?.[0]);
     if (!newUser) {
-        return { message: "Помилка завершення реєстрації, спробуйте увійти", status: 500 };
+        throw BadRequestError("Помилка завершення реєстрації, спробуйте увійти");
     }
     const authType = "creds-" + (newUser.user_type === "admin" ? "admin" : "user");
     const result = await authorizeUser(newUser, req, authType);

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

@@ -1,4 +1,3 @@
-import { FastifyReply } from "fastify";
 import { ExtendedRequest } from "../../../../types/core.js";
-export default function updateUserInfo(req: ExtendedRequest, reply: FastifyReply): Promise<any>;
+export default function updateUserInfo(req: ExtendedRequest): Promise<any>;
 //# sourceMappingURL=updateUserInfo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"updateUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/updateUserInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAK5D,wBAA8B,cAAc,CAC1C,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,gBAuBpB"}
+{"version":3,"file":"updateUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/updateUserInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,wBAA8B,cAAc,CAAC,GAAG,EAAE,eAAe,gBAsBhE"}

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

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

package/dist/server/routes/auth/controllers/euSign/authByData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authByData.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/euSign/authByData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAcvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AA0B5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAoIpB"}
+{"version":3,"file":"authByData.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/euSign/authByData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAcvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AA2B5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBA8HpB"}

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

@@ -7,6 +7,7 @@ import checkReferer from "../../../../plugins/auth/funcs/checkReferer.js";
 import getQuery from "../../../../plugins/auth/funcs/getQuery.js";
 import logAuth from "../../../../plugins/auth/funcs/logAuth.js";
 import authorizeUser from "../../../../plugins/auth/funcs/authorizeUser.js";
+import { BadRequestError, ForbiddenError, NotImplementedError } from "../../../../../errors.js";
 function fetchWithoutSSL(url, options) {
     const httpsAgent = new Agent({
         connect: {
@@ -48,7 +49,7 @@ export default async function authByData(req, reply) {
             authType,
             hostOauth,
         });
-        return reply.status(400).send("Невалідний парметр тип авторизації");
+        throw BadRequestError("Невалідний парметр тип авторизації");
     }
     // referer + token check
     const invalidReferer = await checkReferer({
@@ -62,9 +63,7 @@ export default async function authByData(req, reply) {
             referer,
             code,
         });
-        return reply
-            .status(403)
-            .send("Параметри data / code / state мають невірний формат, або Ви перейшли за прямим посиланням.");
+        throw ForbiddenError("Параметри data / code / state мають невірний формат, або Ви перейшли за прямим посиланням.");
     }
     const url = authType === "govid"
         ? `${hostOauth}/api-user/auth_data?token=${code}`
@@ -122,8 +121,6 @@ export default async function authByData(req, reply) {
             error: err.toString(),
             stack: err.stack,
         });
-        return reply
-            .status(500)
-            .send(`Помилка авторизації через ${authType === "govid" ? "id.gov.ua" : "google"}. Зверніться до Адміністратора!`);
+        throw NotImplementedError(`Помилка авторизації через ${authType === "govid" ? "id.gov.ua" : "google"}. Зверніться до Адміністратора!`);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAyBvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAuHpE"}
+{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0BvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAmHpE"}

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

@@ -3,6 +3,7 @@ import pgClients from "../../../../plugins/pg/pgClients.js";
 import dataInsert from "../../../../plugins/crud/funcs/dataInsert.js";
 import { sign, scryptHash } from "../../../../plugins/auth/funcs/jwt.js";
 import authorizeUser from "../../../../plugins/auth/funcs/authorizeUser.js";
+import { BadRequestError, NotFoundError } from "../../../../../errors.js";
 const getIp = (req) => (req.headers?.["x-real-ip"] ||
     req.headers?.["x-forwarded-for"] ||
     req.ip ||
@@ -18,14 +19,10 @@ export default async function authorize(req, reply) {
     const payload = req.method === "POST" ? body : query;
     const { response_type, client_id, redirect_uri, scope } = payload;
     if (response_type !== "code") {
-        return reply
-            .code(400)
-            .send({ error: "unsupported response_type", code: 400 });
+        throw BadRequestError("unsupported response_type");
     }
     if (!client_id) {
-        return reply
-            .code(400)
-            .send({ error: "not enough query params: client_id", code: 400 });
+        throw BadRequestError("not enough query params: client_id");
     }
     const ip = getIp(req);
     const q = `select * from oauth.clients where client_id=$1 and token_endpoint_auth_method=$2 and (allowed_ips is null or $3=any(allowed_ips)) and ${scope ? "$4=any(scopes)" : "1=1"} order by allowed_ips nulls last limit 1`;
@@ -35,12 +32,12 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows?.[0] || {})
         : {};
     if (!userId) {
-        return reply.code(400).send({ error: "invalid client id", code: 400 });
+        throw BadRequestError("invalid client id");
     }
     if (redirect_uri &&
         Array.isArray(redirect_uris) &&
         !redirect_uris.includes(redirect_uri)) {
-        return reply.code(400).send({ error: "invalid redirect_uri", code: 400 });
+        throw BadRequestError("invalid redirect_uri");
     }
     const user = pg.pk?.["admin.users"]
         ? await pg
@@ -50,7 +47,7 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows[0])
         : null;
     if (!user) {
-        return reply.code(404).send({ error: "user not found", code: 404 });
+        throw NotFoundError("user not found");
     }
     const href1 = req.method === "POST"
         ? null

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;AAsB5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAwEpB"}
+{"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;AA2B5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAmEpB"}