adminizer 4.1.0-build.2 → 4.1.0-build.21

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.d.ts

@@ -10,6 +10,10 @@ export interface Attribute {
     collection?: string;
     via?: string;
     allowNull?: boolean;
+    /**
+     * This is a field that indicates that it refers to keep the bond key 1: 1
+     */
+    primaryKeyForAssociation?: boolean;
 }
 export interface ModelAttributes {
     [key: string]: Attribute;
@@ -49,7 +53,7 @@ export declare abstract class AbstractModel<T> {
     update(criteria: Partial<T>, data: Partial<T>, dataAccessor: DataAccessor): Promise<Partial<T>[]>;
     destroyOne(criteria: Partial<T>, dataAccessor: DataAccessor): Promise<Partial<T> | null>;
     destroy(criteria: Partial<T>, dataAccessor: DataAccessor): Promise<Partial<T>[]>;
-    count(criteria: Partial<T> | undefined): Promise<number>;
+    count(criteria: Partial<T> | undefined, dataAccessor: DataAccessor): Promise<number>;
 }
 export declare abstract class AbstractAdapter {
     abstract Model: any;

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) {
@@ -48,7 +46,8 @@ export class AbstractModel {
         let records = await this._destroy(criteria);
         return records.map(record => dataAccessor.process(record));
     }
-    async count(criteria) {
+    async count(criteria, dataAccessor) {
+        criteria = await dataAccessor.sanitizeUserRelationAccess(criteria);
         return this._count(criteria);
     }
 }

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,8 +1,17 @@
 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>);
+    _convertCriteriaToSequelize(criteria: any): any;
+    _convertWaterlineCriteriaToSequelizeOptions(criteria: any): {
+        where?: any;
+        limit?: number;
+        offset?: number;
+        order?: any[];
+    };
+    _assignAssociations(instance: any, assocData: Record<string, any>): Promise<void>;
     protected _create(data: Record<string, any>): Promise<T>;
     protected _findOne(criteria: Partial<T>): Promise<T | null>;
     protected _find(criteria?: Partial<T>, options?: FindOptions): Promise<T[]>;
@@ -21,6 +30,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>;
 }