adminizer 4.1.0-commit.3bf605e → 4.1.0-commit.d8a06d3

package/helpers/accessRightsHelper.js

@@ -53,6 +53,6 @@ export class AccessRightsHelper {
             Adminizer.log.error("Adminpanel > Token is not valid");
             return false;
         }
-        return user.groups.some((group) => group.tokens.includes(tokenId));
+        return user.groups.some((group) => group.tokens?.includes(tokenId));
     }
 }

package/helpers/configHelper.js

@@ -77,7 +77,7 @@ export class ConfigHelper {
         }
         // Boolean notation: `true` means field is visible; `false` means field is hidden.
         if (typeof config === "boolean") {
-            return config ? { title: key } : false;
+            return config ? { title: key } : { visible: false };
         }
         // String notation: Interpreted as the field title.
         if (typeof config === "string") {
@@ -86,6 +86,7 @@ export class ConfigHelper {
         // Object notation: Allows full customization of the field.
         if (typeof config === "object" && config !== null) {
             config.title = config.title || key;
+            config.visible = config.visible === undefined ? true : Boolean(config.visible);
             // For association types, determine display field by checking model attributes.
             if (["association", "association-many"].includes(config.type)) {
                 let associatedModelAttributes = {};

package/helpers/fieldsHelper.d.ts

@@ -10,7 +10,7 @@ export type Field = {
         type?: FieldsTypes;
         groupsAccessRights?: string[];
     } | string | boolean;
-    /** for populated fields' configs */
+    /** For render associalitons fields */
     populated: {
         [key: string]: Field;
     } | undefined;

package/helpers/inertiaActionsHelper.js

@@ -4,7 +4,7 @@ export default function inertiaActionsHelper(actionType, entity, req) {
         const actions = req.adminizer.menuHelper.getGlobalActions(entity.config, actionType);
         if (actions && actions.length > 0) {
             actions.forEach(function (action) {
-                if (req.adminizer.accessRightsHelper.hasPermission(action.accessRightsToken, req.session.UserAP)) {
+                if (req.adminizer.accessRightsHelper.hasPermission(action.accessRightsToken, req.user)) {
                     resActions.push({
                         link: action.link,
                         id: action.id,

package/helpers/inertiaAddHelper.d.ts

@@ -436,7 +436,7 @@ export declare function getControlsOptions(fieldConfig: BaseFieldConfig, req: Re
     };
     path: {};
 };
-export declare function inputText(type: string, isIn: string[]): "email" | "password" | "number" | "date" | "time" | "color" | "month" | "week" | "range" | "text" | "select" | "datetime-local";
+export declare function inputText(type: string, isIn: string[]): "email" | "password" | "date" | "time" | "number" | "color" | "month" | "week" | "range" | "text" | "select" | "datetime-local";
 export declare function getControl(req: ReqType, type: ControlType, name: string | undefined, defaultControlName: string): AbstractControls;
 export declare function setSelectMany(isIn: string[], value: string[] | undefined): {
     initOptions: {

package/helpers/inertiaAddHelper.js

@@ -25,6 +25,8 @@ export default function inertiaAddHelper(req, entity, fields, record, view = fal
             continue;
         let field = fields[key];
         let fieldConfig = field.config;
+        if (!!fieldConfig.visible === false)
+            continue;
         const type = (fieldConfig.type || fieldConfig.type).toLowerCase();
         //@ts-ignore TODO: fix model validations
         const isIn = typeof fieldConfig.isIn === 'object' ? fieldConfig.isIn : (field.model && typeof { ...field.model.validations }.isIn === 'object' ? { ...field.model.validations }.isIn : []);

package/helpers/inertiaFromHelper.js

@@ -9,6 +9,8 @@ export default function inertiaFormHelper(req, postLink, formData) {
     };
     for (const key of Object.keys(formData)) {
         let field = formData[key];
+        if (field.visible === false)
+            continue;
         const type = (field.type || field.type).toLowerCase();
         const isIn = field.isIn ?? [];
         let label = field.title ?? '';

package/helpers/inertiaGroupHelper.d.ts

@@ -1,3 +1,5 @@
+import { GroupAP } from "models/GroupAP";
+import { UserAP } from "models/UserAP";
 import { AccessRightsToken, Entity, PropsField } from "../interfaces/types";
 interface groupedTokens {
     header: string;
@@ -20,7 +22,7 @@ interface listProps extends Record<string | number | symbol, unknown> {
     users: PropsField[];
     groupedTokens: groupedTokens[];
 }
-export declare function inertiaGroupHelper(entity: Entity, req: ReqType, users: ModelsAP["UserAP"][], groupedTokens: {
+export declare function inertiaGroupHelper(entity: Entity, req: ReqType, users: UserAP[], groupedTokens: {
     [key: string]: AccessRightsToken[];
-}, group?: ModelsAP["GroupAP"], view?: boolean): listProps;
+}, group?: GroupAP, view?: boolean): listProps;
 export {};

package/helpers/inertiaGroupHelper.js

@@ -55,7 +55,7 @@ export function inertiaGroupHelper(entity, req, users, groupedTokens, group, vie
                     label: token.name,
                     tooltip: token.description,
                     name: `token-checkbox-${token.id}`,
-                    value: group ? (group.tokens && group.tokens.includes(token.id)) : false,
+                    value: group ? (group.tokens && group.tokens?.includes(token.id)) : false,
                     type: 'checkbox'
                 });
             }

package/helpers/inertiaListHelper.js

@@ -24,22 +24,22 @@ export function inertiaListHelper(entity, req, fields) {
         searchBtn: req.i18n.__('Search'),
         resetBtn: req.i18n.__('Reset'),
     };
-    if (entity.config.add && req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+    if (entity.config.add && req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
         props.crudActions.createTitle = req.i18n.__('create');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.user)) {
         props.crudActions.editTitle = req.i18n.__('Edit');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.user)) {
         props.crudActions.viewsTitle = req.i18n.__('View');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.user)) {
         props.crudActions.deleteTitle = req.i18n.__('Delete');
     }
     props.actions = inertiaActionsHelper(actionType, entity, req);
     if (req.adminizer.menuHelper.hasInlineActions(entity.config, 'list')) {
         for (const inlineAction of req.adminizer.menuHelper.getInlineActions(entity.config, 'list')) {
-            if (req.adminizer.accessRightsHelper.hasPermission(inlineAction.accessRightsToken, req.session.UserAP)) {
+            if (req.adminizer.accessRightsHelper.hasPermission(inlineAction.accessRightsToken, req.user)) {
                 props.inlineActions.push({
                     icon: inlineAction.icon,
                     id: inlineAction.id,

package/helpers/inertiaMenuHelper.js

@@ -13,7 +13,7 @@ export class InertiaMenuHelper {
             }) : [];
             if (menuItem.accessRightsToken)
                 menuItemTokens.push(menuItem.accessRightsToken);
-            if (this.adminizer.accessRightsHelper.enoughPermissions(menuItemTokens, req.session.UserAP)) {
+            if (this.adminizer.accessRightsHelper.enoughPermissions(menuItemTokens, req.user)) {
                 menu.push(menuItem);
             }
         }

package/helpers/inertiaUserHelper.d.ts

@@ -1,3 +1,5 @@
+import { GroupAP } from "models/GroupAP";
+import { UserAP } from "models/UserAP";
 import { Entity, PropsField } from "../interfaces/types";
 interface listProps extends Record<string | number | symbol, unknown> {
     edit: boolean;
@@ -16,6 +18,10 @@ interface listProps extends Record<string | number | symbol, unknown> {
     fields: PropsField[];
     groups: PropsField[];
     locales: Record<string, string>[];
+    userPretend: {
+        label: string;
+        postLink: string;
+    };
 }
-export declare function inertiaUserHelper(entity: Entity, req: ReqType, groups: ModelsAP["GroupAP"][], user?: ModelsAP["UserAP"], view?: boolean): listProps;
+export declare function inertiaUserHelper(entity: Entity, req: ReqType, groups: GroupAP[], user?: UserAP, view?: boolean): listProps;
 export {};

package/helpers/inertiaUserHelper.js

@@ -6,6 +6,10 @@ export function inertiaUserHelper(entity, req, groups, user, view = false) {
             title: req.i18n.__('Back'),
             link: entity.uri
         },
+        userPretend: {
+            label: req.i18n.__('Pretend to be a user'),
+            postLink: `${req.adminizer.config.routePrefix}/model/userap/login`
+        },
         passwordError: req.i18n.__('Values in "password" and "repeatPassword" fields should be the same'),
         btnSave: {
             title: req.i18n.__('Save')
@@ -58,7 +62,7 @@ export function inertiaUserHelper(entity, req, groups, user, view = false) {
             value: user?.locale ?? ''
         });
     }
-    if (req.session.UserAP.isAdministrator) {
+    if (req.user.isAdministrator) {
         props.fields.push({
             label: req.i18n.__('Profile expires'),
             type: 'date',

package/index.d.ts

@@ -8,4 +8,11 @@ export * from "./interfaces/adminpanelConfig";
 export * from "./lib/v4/model/AbstractModel";
 export * from "./lib/v4/model/adapter/waterline";
 export * from "./lib/v4/model/adapter/typeorm";
+export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
+export * from "./models/GroupAP";
+export * from "./models/UserAP";
+export * from "./models/MediaManagerAP";
+export * from "./models/MediaManagerAssociationsAP";
+export * from "./models/MediaManagerMetaAP";
+export * from "./models/NavigationAP";

package/index.js

@@ -8,4 +8,11 @@ export * from "./interfaces/adminpanelConfig";
 export * from "./lib/v4/model/AbstractModel";
 export * from "./lib/v4/model/adapter/waterline";
 export * from "./lib/v4/model/adapter/typeorm";
+export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
+export * from "./models/GroupAP";
+export * from "./models/UserAP";
+export * from "./models/MediaManagerAP";
+export * from "./models/MediaManagerAssociationsAP";
+export * from "./models/MediaManagerMetaAP";
+export * from "./models/NavigationAP";

package/interfaces/adminpanelConfig.d.ts

@@ -1,6 +1,8 @@
 import { MaterialIcon } from "./MaaterialIcons";
 import { EditorOptions } from "@toast-ui/editor/types/editor";
 import { GridSettings as HandsontableSettings } from "handsontable/settings";
+import { GroupAP } from "models/GroupAP";
+import { UserAP } from "models/UserAP";
 export type AdminpanelIcon = MaterialIcon;
 export type FieldsTypes = "string" | "password" | "date" | "datetime" | "time" | "integer" | "number" | "float" | "color" | "email" | "month" | "week" | "range" | "boolean" | "binary" | "text" | "longtext" | "mediumtext" | "ckeditor" | "wysiwyg" | "texteditor" | "word" | 'tui' | 'tuieditor' | 'toast-ui' | "jsoneditor" | "json" | "array" | "object" | "ace" | "code" | "html" | "xml" | "aceeditor" | "menu" | "schedule" | "worktime" | "association" | "association-many" | "select" | "select-many" | "table" | "geojson" | "mediamanager" | 
 /**
@@ -268,8 +270,8 @@ export interface ModelConfig {
     } | string;
     userAccessRelationCallback?: (userWithGroups: UserWithGroups, record: any) => boolean;
 }
-type UserWithGroups = ModelsAP["UserAP"] & {
-    groups: ModelsAP["GroupAP"][];
+type UserWithGroups = UserAP & {
+    groups: GroupAP[];
 };
 export interface FieldsForms {
     [key: string]: FormFieldConfig;
@@ -316,6 +318,8 @@ export interface BaseFieldConfig {
     disabled?: boolean;
     /** Show as required element HTML */
     required?: boolean;
+    /** show or hode element, default `true` */
+    visible?: boolean;
 }
 export interface TuiEditorFieldConfig extends BaseFieldConfig {
     type: 'tui' | 'tuieditor' | 'toast-ui';

package/interfaces/global.d.ts

@@ -4,15 +4,10 @@ import multer from "multer";
 import { I18n } from "../lib/v4/I18n";
 import { Inertia } from "../lib/inertia/inertiaAdapter";
 import { Flash } from "../lib/inertia/flash";
+import { UserAP } from "models/UserAP";
 declare global {
+    /** @deprecated use import from TS model decalration */
     type ModelsAP = {
-        GroupAP: {
-            id?: number;
-            name: string;
-            description?: string;
-            tokens?: string[];
-            users?: ModelsAP["UserAP"][];
-        };
         MediaManagerAP: {
             id?: string;
             parent?: ModelsAP["MediaManagerAP"];
@@ -48,36 +43,20 @@ declare global {
             label: string;
             tree: any;
         };
-        UserAP: {
-            id?: number;
-            login?: string;
-            fullName?: string;
-            email?: string;
-            passwordHashed?: string;
-            password?: string;
-            timezone?: string;
-            expires?: string;
-            locale?: string;
-            isDeleted?: boolean;
-            isActive?: boolean;
-            isAdministrator?: boolean;
-            groups?: ModelsAP["GroupAP"][];
-            widgets?: any;
-            isConfirmed?: boolean;
-        };
     };
     type reqSession = {
         flashMessages: Record<string, string[]>;
         xInertiaCurrentComponent: string | undefined;
-        UserAP: ModelsAP["UserAP"];
+        UserAP: UserAP;
         messages: {
             adminError: string[];
             adminSuccess: string[];
         };
-        adminPretender?: ModelsAP["UserAP"];
+        userPretended?: UserAP;
     };
     type FlashMessages = 'info' | 'error' | 'success' | string;
     type ReqType = Request & {
+        user: UserAP;
         Inertia: Inertia;
         flash: Flash<FlashMessages>;
         session: reqSession;

package/lib/Adminizer.d.ts

@@ -24,8 +24,10 @@ export declare class Adminizer {
     widgetHandler: WidgetHandler;
     vite: ViteDevServer;
     controlsHandler: ControlsHandler;
+    jwtSecret: string;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);
+    getMiddleware(): (req: any, res: any) => void;
     /**
      * Vite middleware
      * @protected

package/lib/Adminizer.js

@@ -29,6 +29,7 @@ import { bindInertia } from "../system/bindInertia";
 import { MenuHelper } from "../helpers/menuHelper";
 import { bindControls } from "../system/bindControls";
 import { ControlsHandler } from "./controls/ControlsHandler";
+import { v4 as uuid } from "uuid";
 export class Adminizer {
     app;
     config;
@@ -42,6 +43,7 @@ export class Adminizer {
     widgetHandler;
     vite;
     controlsHandler;
+    jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
         level: "info",
         format: winston.format.combine(winston.format.timestamp(), winston.format.printf(({ timestamp, level, message, ...meta }) => {
@@ -58,6 +60,21 @@ export class Adminizer {
         this._emitter = new EventEmitter();
         this.ormAdapters = ormAdapters;
     }
+    getMiddleware() {
+        return (req, res) => {
+            this.app(req, res, (err) => {
+                if (err) {
+                    console.error("Error in Adminizer", err);
+                    res.writeHead(500, { 'Content-Type': 'text/plain' });
+                    res.end('Internal Server Error');
+                }
+                else {
+                    res.writeHead(404, { 'Content-Type': 'text/plain' });
+                    res.end('Route Not Found in Adminizer');
+                }
+            });
+        };
+    }
     /**
      * Vite middleware
      * @protected
@@ -105,7 +122,6 @@ export class Adminizer {
                 set: configForms.set ?? defaultForms.set
             }
         };
-        // console.log("CONFIG", this.config)
         this.modelHandler = new ModelHandler();
         await bindModels(this);
         await bindForms(this);

package/lib/catalog/AbstractCatalog.js

@@ -207,7 +207,6 @@ export class AbstractCatalog {
         else {
             action = this.actionHandlers.find((it) => it.id === actionId);
         }
-        // console.log(this.actionHandlers)
         if (!action)
             throw `Action with id \`${actionId}\` not found`;
         return await action.handler(items, config);

package/lib/catalog/Navigation.js

@@ -326,7 +326,7 @@
 // 		let items = await this.adminizer.modelHandler.model.get(this.model)["_find"]({})
 //
 // 		// This dirty hack is here because the field of view is disappearing
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
 // 		}
@@ -354,7 +354,7 @@
 // 		let type: 'html' = 'html'
 //
 // 		// This dirty hack is here because the field of view is disappearing
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
 // 		}
@@ -433,7 +433,7 @@
 // 		let type: 'html' = 'html'
 //
 // 		// This dirty hack is here because the field of view is disappearing
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
 // 		}
@@ -460,7 +460,7 @@
 // 		let item = await this.find(id, catalogId)
 //
 // 		// This dirty hack is here because the field of view is disappearing
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
 // 		}
@@ -496,7 +496,7 @@
 //
 // 	getAddHTML(req: ReqType): Promise<{ type: "link" | "html" | "jsonForm"; data: string }> {
 // 		let type: 'html' = 'html'
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 //
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
@@ -514,7 +514,7 @@
 // 		let type: 'html' = 'html'
 // 		let item = await this.find(id, catalogId)
 //
-// 		req.i18n.setLocale(req.session.UserAP.locale);
+// 		req.i18n.setLocale(req.user.locale);
 // 		const __ = (s: string) => {
 // 			return req.i18n.__(s)
 // 		}

package/lib/datatable/NodeTable.js

@@ -98,7 +98,6 @@ export class NodeTable {
                             columnQuery = { [fieldsArray[parseInt(columnName)]]: { contains: searchStr } };
                             break;
                         default:
-                            // Пропускаем json, ref и ассоциации
                             break;
                     }
                 }
@@ -135,7 +134,6 @@ export class NodeTable {
             const totalRecords = await this.model.count({});
             const filteredRecords = await this.model.count(queryOptions.where);
             const data = await this.model.find(queryOptions, dataAccessor);
-            console.log(data, "data");
             const output = {
                 draw: this.request.draw !== "" ? this.request.draw : 0,
                 recordsTotal: totalRecords,
@@ -201,7 +199,6 @@ export class NodeTable {
             });
             out.push(row);
         });
-        console.log(out);
         return out;
     }
 }

package/lib/inertia/inertiaAdapter.js

@@ -21,7 +21,6 @@ const inertiaExpressAdapter = function ({ version, html, flashMessages, enableRe
             if (!['GET', 'HEAD', 'OPTIONS'].includes(req.method)) {
                 const csrfCookie = req.cookies['XSRF-TOKEN'];
                 const csrfHeader = req.headers[csrf.headerName || 'x-xsrf-token'];
-                // console.log('headers:', req.headers['x-xsrf-token']);
                 if (!csrfCookie || !csrfHeader || csrfCookie !== csrfHeader) {
                     res.status(403).send({ message: 'Invalid CSRF token' });
                     return;

package/lib/installStepper/installStepper.js

@@ -91,21 +91,21 @@ export class InstallStepper {
         let leftSteps = this.steps.filter(step => !step.isProcessed && !step.isSkipped);
         // set locale
         if (typeof req.adminizer.config.translation !== "boolean") {
-            if (!req.session.UserAP.locale || !req.adminizer.config.translation.locales.includes(req.session.UserAP.locale)) {
-                req.session.UserAP.locale = req.adminizer.config.translation.defaultLocale || "en";
+            if (!req.user.locale || !req.adminizer.config.translation.locales.includes(req.user.locale)) {
+                req.user.locale = req.adminizer.config.translation.defaultLocale || "en";
             }
         }
         else {
-            req.session.UserAP.locale = "en";
+            req.user.locale = "en";
         }
-        this.context.locale = req.session.UserAP.locale;
+        this.context.locale = req.user.locale;
         // translate step
         stepToRender = TranslationHelper.translateProperties(req.i18n, stepToRender, ["title", "description", "name"]);
         return {
             totalStepCount: this.steps.length,
             leftStepsCount: leftSteps.length,
             currentStep: stepToRender,
-            locale: req.session.UserAP.locale
+            locale: req.user.locale
         };
     }
     async skipStep(stepId) {

package/lib/media-manager/AbstractMediaManager.d.ts

@@ -143,10 +143,10 @@ export declare abstract class AbstractMediaManager {
     uloadAllowedTypes: string[];
     dir: string;
     /**
-     * Разрешает или нет поиск по названию
+     
      */
     allowSearch: boolean;
-    /**  ⚠️ ВЫШЕ НАСТРОЙКИ КОТОРЫЕ НАДО РЕАЛИЗОВАТЬ */
+    /**⚠️ above the settings that need to be implemented*/
     /**
      * id for mediamanager instance
      */

package/lib/media-manager/AbstractMediaManager.js

@@ -34,7 +34,7 @@ export class AbstractMediaManager {
     uloadAllowedTypes;
     dir;
     /**
-     * Разрешает или нет поиск по названию
+     
      */
     allowSearch;
     itemTypes = [];

package/lib/v4/DataAccessor.d.ts

@@ -4,9 +4,10 @@
 import { Entity } from "../../interfaces/types";
 import { ActionType } from "../../interfaces/adminpanelConfig";
 import { Fields } from "../../helpers/fieldsHelper";
+import { UserAP } from "models/UserAP";
 export declare class DataAccessor {
     private readonly adminizer;
-    user: ModelsAP["UserAP"];
+    user: UserAP;
     entity: Entity;
     action: ActionType;
     private fields;

package/lib/v4/DataAccessor.js

@@ -8,7 +8,7 @@ export class DataAccessor {
     fields = null;
     constructor(req, entity, action) {
         this.adminizer = req.adminizer;
-        this.user = req.session.UserAP;
+        this.user = req.user;
         this.entity = entity;
         this.action = action;
     }
@@ -26,7 +26,7 @@ export class DataAccessor {
         }
         // get action and field configs
         const actionConfig = ControllerHelper.findActionConfig(this.entity, this.action);
-        const fieldsConfig = this.entity.config.fields || {};
+        const fieldsConfig = this.entity.config?.fields || {};
         const modelAttributes = this.entity.model.attributes;
         const result = {};
         Object.entries(modelAttributes).forEach(([key, modelField]) => {

package/lib/v4/POWCaptcha.js

@@ -54,7 +54,6 @@ export class POWCaptcha {
         if (!task || task.label !== label)
             return false;
         // Verify the solution (should be equal to puzzleOptions.message)
-        // console.log("QUESTION", `${taskId}:${label}`)
         if (`${taskId}:${label}` === captchaSolution) {
             this.deleteTask(taskId);
             return true;

package/lib/v4/PolicyManager.js

@@ -27,7 +27,6 @@ class PolicyManager {
             Adminizer.log.info("Adminizer policies loaded");
         }
         catch (e) {
-            console.log(e);
             Adminizer.log.error("Adminizer > Could not load policies", e);
         }
     }

package/lib/v4/helper/jwt.d.ts

@@ -0,0 +1,10 @@
+export declare function signUser(user: JwtPayload, JWT_SECRET: string): string;
+interface JwtPayload {
+    id: number;
+    login: string;
+    isAdministrator?: boolean;
+    iat?: number;
+    exp?: number;
+}
+export declare function verifyUser(token: string, JWT_SECRET: string): JwtPayload | null;
+export {};

package/lib/v4/helper/jwt.js

@@ -0,0 +1,18 @@
+import jwt from 'jsonwebtoken';
+export function signUser(user, JWT_SECRET) {
+    return jwt.sign(user, JWT_SECRET, {
+        expiresIn: '15d',
+    });
+}
+export function verifyUser(token, JWT_SECRET) {
+    try {
+        const decoded = jwt.verify(token, JWT_SECRET);
+        if (typeof decoded === 'object' && decoded !== null && 'id' in decoded && 'login' in decoded) {
+            return decoded;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}

package/lib/v4/model/AbstractModel.js

@@ -17,13 +17,11 @@ export class AbstractModel {
     async findOne(criteria, dataAccessor) {
         criteria = await dataAccessor.sanitizeUserRelationAccess(criteria);
         let record = await this._findOne(criteria);
-        console.log(record, "record");
         return record ? dataAccessor.process(record) : null;
     }
     async find(criteria, dataAccessor) {
         criteria = await dataAccessor.sanitizeUserRelationAccess(criteria);
         let records = await this._find(criteria);
-        console.log(records, "records");
         return records.map(record => dataAccessor.process(record));
     }
     async updateOne(criteria, data, dataAccessor) {

package/lib/v4/model/ModelHandler.js

@@ -8,7 +8,6 @@ export class ModelHandler {
         }
         this.models.set(modelname, modelInstance);
         Adminizer.log.debug(`Model with name [${modelname}] was registered`);
-        console.log(`Model with name [${modelname}] was registered`);
     }
     /** Improved model getter, so you can write both model.get("UserAP") and model.get("userap") */
     get model() {

package/lib/v4/model/adapter/sequelize.d.ts

@@ -1,5 +1,6 @@
 import { Sequelize, ModelStatic } from "sequelize";
-import { AbstractAdapter, AbstractModel, FindOptions } from "../AbstractModel";
+import { AbstractAdapter, AbstractModel, Attribute, FindOptions } from "../AbstractModel";
+export declare function mapSequelizeToWaterline(model: ModelStatic<any>): Record<string, Attribute>;
 export declare class SequelizeModel<T> extends AbstractModel<T> {
     private model;
     constructor(modelName: string, model: ModelStatic<any>);
@@ -21,6 +22,6 @@ export declare class SequelizeAdapter extends AbstractAdapter {
     get models(): Record<string, any>;
     getModel(modelName: string): any;
     getAttributes(modelName: string): any;
-    /** Регистрация системных моделей */
+    /**Registration of system models*/
     static registerSystemModels(sequelize: Sequelize): Promise<void>;
 }