adminizer 4.3.0-build.99 → 4.3.1

package/lib/media-manager/DefaultMediaManager.js

@@ -1,6 +1,6 @@
-import { AbstractMediaManager, } from "./AbstractMediaManager";
-import { populateVariants } from "./helpers/MediaManagerHelper";
-import { ApplicationItem, ImageItem, TextItem, VideoItem } from "./Items";
+import { AbstractMediaManager, } from "./AbstractMediaManager.js";
+import { populateVariants } from "./helpers/MediaManagerHelper.js";
+import { ApplicationItem, ImageItem, TextItem, VideoItem } from "./Items.js";
 export class DefaultMediaManager extends AbstractMediaManager {
     itemTypes = [];
     model = "mediamanagerap";
@@ -57,7 +57,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
     }
     async setRelations(data, model, modelId, widgetName) {
         let modelAssociations = await this.adminizer.modelHandler.model.get(this.modelAssoc)["_find"]({
-            where: { modelId: modelId, model: model, widgetName: widgetName },
+            where: { modelId: +modelId, model: model.toLowerCase(), widgetName: widgetName },
         });
         for (const modelAssociation of modelAssociations) {
             const q = {};
@@ -69,26 +69,31 @@ export class DefaultMediaManager extends AbstractMediaManager {
         for (const [key, widgetItem] of data.entries()) {
             await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
                 mediaManagerId: this.id,
-                model: model,
-                modelId: modelId,
+                model: model.toLowerCase(),
+                modelId: +modelId,
                 [fieldName]: widgetItem.id,
                 widgetName: widgetName,
                 sortOrder: key + 1,
             });
         }
     }
-    async getItemsList(items) {
+    async getRelations(model, widgetName, modelId) {
         let widgetItems = [];
-        for (const item of items) {
-            //TODO refactor CRUD functions for DataAccessor usage
-            let file = (await this.adminizer.modelHandler.model.get(this.model)["_find"]({
-                where: { id: item.id }
-            }, { populate: [["variants", { sort: "createdAt DESC" }]] }))[0];
+        const fieldName = this.adminizer.ormAdapters[0].ormType === 'sequelize' ? 'fileRef' : 'file';
+        let files = await this.adminizer.modelHandler.model.get(this.modelAssoc)['_find']({
+            where: {
+                model: model.toLowerCase(),
+                widgetName: widgetName,
+                modelId: +modelId
+            },
+            sort: "sortOrder ASC"
+        }, { populate: [[fieldName, {}]] });
+        for (const file of files) {
             widgetItems.push({
-                id: file.id,
-                mimeType: file.mimeType,
-                url: file.url,
-                variants: file.variants,
+                id: file[fieldName].id,
+                mimeType: file[fieldName].mimeType,
+                url: file[fieldName].url,
+                variants: []
             });
         }
         return widgetItems;

package/lib/media-manager/Items.js

@@ -1,9 +1,10 @@
-import { File } from "./AbstractMediaManager";
-import { populateVariants, randomFileName } from "./helpers/MediaManagerHelper";
+import { File } from "./AbstractMediaManager.js";
+import { populateVariants, randomFileName } from "./helpers/MediaManagerHelper.js";
 import sizeOf from "image-size";
 import sharp from "sharp";
 import * as fs from 'fs';
 import * as path from 'path';
+import * as process from "node:process";
 export class ImageItem extends File {
     type = "image";
     model = "mediamanagerap";
@@ -55,7 +56,7 @@ export class ImageItem extends File {
             parent: null,
             mimeType: file.mimetype,
             size: file.size,
-            path: file.path,
+            path: `${this.fileStoragePath}/${this.urlPathPrefix}/${filename}`,
             group: group,
             tag: "origin",
             filename: origFileName,
@@ -64,7 +65,7 @@ export class ImageItem extends File {
         await this.createMeta(parent.id);
         await this.addFileMeta(file.path, parent.id);
         // create file variants
-        if (Object.keys(this.imageSizes).length) {
+        if (Object.keys(this.imageSizes).length && file.mimetype !== 'image/svg+xml') {
             await this.createVariants(file, parent, filename, group);
         }
         // TODO refactor CRUD functions for DataAccessor usage
@@ -148,7 +149,7 @@ export class ImageItem extends File {
     }
     async resizeImage(input, output, width, height) {
         // Get the directory from the output path
-        const outputDir = path.dirname(output);
+        const outputDir = `${process.cwd()}/${path.dirname(output)}`;
         // Check if the directory exists, and create it if it doesn't
         if (!fs.existsSync(outputDir)) {
             fs.mkdirSync(outputDir, { recursive: true });
@@ -209,7 +210,7 @@ export class TextItem extends ImageItem {
             parent: null,
             mimeType: file.mimetype,
             size: file.size,
-            path: file.path,
+            path: `${this.fileStoragePath}/${filename}`,
             group: group,
             filename: origFileName,
             tag: "origin",

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

@@ -1,6 +1,6 @@
 import { AbstractMediaManager } from "./AbstractMediaManager";
 export declare class MediaManagerHandler {
-    private static managers;
-    static add(manager: AbstractMediaManager): void;
-    static get(id: string): AbstractMediaManager;
+    private managers;
+    add(manager: AbstractMediaManager): void;
+    get(id: string): AbstractMediaManager;
 }

package/lib/media-manager/MediaManagerHandler.js

@@ -1,10 +1,10 @@
-import { Adminizer } from "../Adminizer";
+import { Adminizer } from "../Adminizer.js";
 export class MediaManagerHandler {
-    static managers = [];
-    static add(manager) {
+    managers = [];
+    add(manager) {
         this.managers.push(manager);
     }
-    static get(id) {
+    get(id) {
         let instance = this.managers.find(e => e.id === id);
         /**
          * ✨ We magically get one

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

@@ -1,3 +1,4 @@
+import { Adminizer } from "../Adminizer";
 export declare class MediaManagerThumb {
-    static getThumb(id: string, managerId: string): Promise<Buffer<ArrayBufferLike>>;
+    static getThumb(id: string, managerId: string, adminizer: Adminizer): Promise<Buffer<ArrayBufferLike>>;
 }

package/lib/media-manager/Thumb.js

@@ -1,10 +1,9 @@
 import sharp from "sharp";
 import { promises as fs } from 'fs';
-import { MediaManagerHandler } from "./MediaManagerHandler";
 export class MediaManagerThumb {
-    static async getThumb(id, managerId) {
+    static async getThumb(id, managerId, adminizer) {
         const fileExists = async (path) => !!(await fs.stat(path).catch(e => false));
-        const manager = MediaManagerHandler.get(managerId);
+        const manager = adminizer.mediaManagerHandler.get(managerId);
         const path = await manager.getOrigin(id);
         const baseThumbPath = `${process.cwd()}/.tmp/thumbs`;
         await fs.mkdir(baseThumbPath, { recursive: true });
@@ -13,7 +12,7 @@ export class MediaManagerThumb {
             return await fs.readFile(thumb);
         }
         else {
-            await sharp(path)
+            await sharp(`${process.cwd()}/${path}`)
                 .resize({ width: 150, height: 150 })
                 .toFile(thumb);
             return await fs.readFile(thumb);

package/lib/media-manager/helpers/MediaManagerHelper.d.ts

@@ -11,19 +11,24 @@ type PostParams = Record<string, string | number | boolean | object | string[] |
 export declare function randomFileName(filenameOrig: string, type: string, prefix: boolean): string;
 /**
  * Save media manager relations to database.
+ * @param adminizer
  * @param fields
  * @param reqData
  * @param model
  * @param recordId
  */
-export declare function saveRelationsMediaManager(fields: Fields, reqData: PostParams, model: string, recordId: string): Promise<void>;
+export declare function saveRelationsMediaManager(adminizer: Adminizer, fields: Fields, reqData: PostParams, model: string, recordId: number): Promise<void>;
 /**
  * Get realtions
+ * @param adminizer
  * @param data
+ * @param model
+ * @param widgetName
  */
-export declare function getRelationsMediaManager(data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
+export declare function getRelationsMediaManager(adminizer: Adminizer, data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
 /**
  * Delate Ralations
+ * @param adminizer
  * @param model
  * @param record
  */

package/lib/media-manager/helpers/MediaManagerHelper.js

@@ -1,4 +1,3 @@
-import { MediaManagerHandler } from "../MediaManagerHandler";
 /**
  * Create a random file name with prefix and type. If prefix is true, the file name will be prefixed with a random string.
  * @param filenameOrig
@@ -13,32 +12,37 @@ export function randomFileName(filenameOrig, type, prefix) {
 }
 /**
  * Save media manager relations to database.
+ * @param adminizer
  * @param fields
  * @param reqData
  * @param model
  * @param recordId
  */
-export async function saveRelationsMediaManager(fields, reqData, model, recordId) {
+export async function saveRelationsMediaManager(adminizer, fields, reqData, model, recordId) {
     for (let prop in reqData) {
         let fieldConfigConfig = fields[prop].config;
         let options = fieldConfigConfig.options;
         if (fieldConfigConfig.type === 'mediamanager') {
             let data = reqData[prop];
-            let mediaManager = MediaManagerHandler.get(options?.id ?? 'default');
+            let mediaManager = adminizer.mediaManagerHandler.get(options?.id ?? 'default');
             await mediaManager.setRelations(data, model, recordId, prop);
         }
     }
 }
 /**
  * Get realtions
+ * @param adminizer
  * @param data
+ * @param model
+ * @param widgetName
  */
-export async function getRelationsMediaManager(data) {
-    let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
-    return await mediaManager.getItemsList(data.list ?? []);
+export async function getRelationsMediaManager(adminizer, data) {
+    let mediaManager = adminizer.mediaManagerHandler.get(data.mediaManagerId);
+    return await mediaManager.getRelations(data.model, data.widgetName, data.modelId);
 }
 /**
  * Delate Ralations
+ * @param adminizer
  * @param model
  * @param record
  */
@@ -48,9 +52,9 @@ export async function deleteRelationsMediaManager(adminizer, model, record) {
         let field = config.fields[key];
         if (field && field.type === 'mediamanager') {
             const option = field.options;
-            let mediaManager = MediaManagerHandler.get(option?.id ?? 'default');
+            let mediaManager = adminizer.mediaManagerHandler.get(option?.id ?? 'default');
             let emptyData = [];
-            await mediaManager.setRelations(emptyData, model, record[0].id, key);
+            await mediaManager.setRelations(emptyData, model, +record[0].id, key);
         }
     }
 }

package/lib/model/AbstractModel.js

@@ -1,4 +1,4 @@
-import { formatChanges, sanitizeForDiff } from "../../helpers/diffHelpers";
+import { formatChanges, sanitizeForDiff } from "../../helpers/diffHelpers.js";
 import { diff } from "deep-object-diff";
 export class AbstractModel {
     modelname;

package/lib/model/ModelHandler.js

@@ -1,4 +1,4 @@
-import { Adminizer } from "../Adminizer";
+import { Adminizer } from "../Adminizer.js";
 export class ModelHandler {
     models = new Map();
     add(modelName, modelInstance) {

package/lib/model/adapter/sequelize.js

@@ -1,5 +1,5 @@
 import { DataTypes, Op } from "sequelize";
-import { AbstractAdapter, AbstractModel } from "../AbstractModel";
+import { AbstractAdapter, AbstractModel } from "../AbstractModel.js";
 import path from "path";
 import fs from "fs";
 import { pathToFileURL } from "url";

package/lib/model/adapter/waterline.js

@@ -1,4 +1,4 @@
-import { AbstractAdapter, AbstractModel } from "../AbstractModel";
+import { AbstractAdapter, AbstractModel } from "../AbstractModel.js";
 import { v4 as uuid } from "uuid";
 import Waterline from "waterline";
 import path from "node:path";
@@ -33,6 +33,12 @@ export class WaterlineModel extends AbstractModel {
         return await query;
     }
     async _find(criteria = {}, options = {}) {
+        // Hack
+        const attributes = this.model.attributes;
+        const associations = Object.keys(attributes).filter(attr => attributes[attr].model || attributes[attr].collection);
+        //@ts-ignore
+        if (associations.includes(criteria?.sort?.split(' ')[0]) && JSON.stringify(criteria.where) === '{}')
+            criteria.sort = undefined;
         let query = this.model.find(criteria);
         if (options.populate && Array.isArray(options.populate) && options.populate.length > 0) {
             options.populate.forEach(([field, populateCriteria]) => {

package/lib/notifications/AbstractNotificationService.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { Adminizer } from '../Adminizer';
+import { Adminizer } from '../Adminizer.js';
 /**
  * ░█████╗░██████╗░░██████╗████████╗██████╗░░█████╗░░█████╗░████████╗
  * ██╔══██╗██╔══██╗██╔════╝╚══██╔══╝██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝

package/lib/notifications/GeneralNotificationService.js

@@ -1,5 +1,5 @@
-import { AbstractNotificationService } from './AbstractNotificationService';
-import { Adminizer } from '../Adminizer';
+import { AbstractNotificationService } from './AbstractNotificationService.js';
+import { Adminizer } from '../Adminizer.js';
 export class GeneralNotificationService extends AbstractNotificationService {
     notificationClass = 'general';
     icon = 'info';

package/lib/notifications/NotificationHandler.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { Adminizer } from '../Adminizer';
+import { Adminizer } from '../Adminizer.js';
 export class NotificationHandler extends EventEmitter {
     services = new Map();
     constructor() {

package/lib/notifications/SystemNotificationService.js

@@ -1,5 +1,5 @@
-import { AbstractNotificationService } from './AbstractNotificationService';
-import { Adminizer } from '../Adminizer';
+import { AbstractNotificationService } from './AbstractNotificationService.js';
+import { Adminizer } from '../Adminizer.js';
 export class SystemNotificationService extends AbstractNotificationService {
     notificationClass = 'system';
     icon = 'settings';

package/lib/requestProcessor.js

@@ -1,5 +1,5 @@
-import { isObject } from "../helpers/JsUtils";
-import { Adminizer } from "./Adminizer";
+import { isObject } from "../helpers/JsUtils.js";
+import { Adminizer } from "./Adminizer.js";
 /**
  * Default helper that will contain all methods
  * that should help with processing request details and bind

package/lib/widgets/abstractAction.js

@@ -1,4 +1,4 @@
-import { BaseWidget } from "./abstractWidgetBase";
+import { BaseWidget } from "./abstractWidgetBase.js";
 export class ActionBase extends BaseWidget {
     widgetType = "action";
 }

package/lib/widgets/abstractInfo.js

@@ -1,4 +1,4 @@
-import { BaseWidget } from "./abstractWidgetBase";
+import { BaseWidget } from "./abstractWidgetBase.js";
 export class InfoBase extends BaseWidget {
     widgetType = "info";
     /** Widget background css color */

package/lib/widgets/abstractLink.js

@@ -1,4 +1,4 @@
-import { BaseWidget } from "./abstractWidgetBase";
+import { BaseWidget } from "./abstractWidgetBase.js";
 export class LinkBase extends BaseWidget {
     widgetType = "link";
 }

package/lib/widgets/abstractSwitch.js

@@ -1,4 +1,4 @@
-import { BaseWidget } from "./abstractWidgetBase";
+import { BaseWidget } from "./abstractWidgetBase.js";
 export class SwitchBase extends BaseWidget {
     widgetType = "switcher";
 }

package/migrations/index.js

@@ -1,4 +1,4 @@
-import { umzugExports } from "./umzugExports";
+import { umzugExports } from "./umzugExports.js";
 export const migrations = {
     umzug: umzugExports
 };

package/migrations/umzugExports.js

@@ -1,4 +1,4 @@
-import { up as up0001, down as down0001 } from "./umzug/0001";
+import { up as up0001, down as down0001 } from "./umzug/0001.js";
 export const umzugExports = [
     {
         name: "0001",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.3.0-build.99",
+  "version": "4.3.1",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
@@ -16,8 +16,9 @@
     "dev:no-seed-clean": "cross-env VITE_ENV=dev NO_SEED_DATA=true CLEAN_TMP=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "dev:waterline": "cross-env VITE_ENV=dev ORM=waterline tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "dev:waterline:no-seed": "cross-env VITE_ENV=dev NO_SEED_DATA=true ORM=waterline tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:cors": "cross-env VITE_ENV=dev NO_SEED_DATA=true ORM=waterline FRONTEND_URL=http://localhost:8080 tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "build:assets": "vite build",
-    "compile:backend": "tsc -p src/tsconfig.json",
+    "compile:backend": "tsc -p src/tsconfig.json && node ./scripts/appendJsExtension.js",
     "compile:ui": "tsc -p tsconfig.ui.json",
     "watch:backend": "tsc -w -p src/tsconfig.json",
     "copy:backend": "node copy-backend.js",
@@ -72,6 +73,7 @@
     "typeorm": "^0.3.20",
     "uuid": "^11.0.5",
     "waterline": "^0.15.2",
+    "sequelize": "^6.37.7",
     "winston": "^3.17.0"
   },
   "devDependencies": {

package/system/Router.js

@@ -1,24 +1,24 @@
-import _dashboard from "../controllers/dashboard";
-import _welcome from "../controllers/welcome";
-import _list from "../controllers/list";
-import _edit from "../controllers/edit";
-import _add from "../controllers/add";
-import _view from "../controllers/view";
-import _remove from "../controllers/remove";
-import { ckEditorUpload } from "../controllers/ckeditorUpload";
-import _form from "../controllers/form";
-import { widgetSwitchController } from "../controllers/widgets/switch";
-import _getAllWidgets from "../controllers/getAllWidgets";
-import _widgetsDB from "../controllers/widgetsDB";
-import { widgetInfoController } from '../controllers/widgets/Info';
-import { widgetActionController } from '../controllers/widgets/Action';
-import { widgetCustomController } from "../controllers/widgets/Custom";
-import { catalogController } from "../controllers/catalog/Catalog";
-import { mediaManagerController } from "../controllers/media-manager/mediaManagerApi";
-import { thumbController } from "../controllers/media-manager/ThumbController";
-import { Adminizer } from "../lib/Adminizer";
-import timezones from "../controllers/timezones";
-import { NotificationController } from "../controllers/notifications/NotificationController";
+import _dashboard from "../controllers/dashboard.js";
+import _welcome from "../controllers/welcome.js";
+import _list from "../controllers/list.js";
+import _edit from "../controllers/edit.js";
+import _add from "../controllers/add.js";
+import _view from "../controllers/view.js";
+import _remove from "../controllers/remove.js";
+import { ckEditorUpload } from "../controllers/ckeditorUpload.js";
+import _form from "../controllers/form.js";
+import { widgetSwitchController } from "../controllers/widgets/switch.js";
+import _getAllWidgets from "../controllers/getAllWidgets.js";
+import _widgetsDB from "../controllers/widgetsDB.js";
+import { widgetInfoController } from '../controllers/widgets/Info.js';
+import { widgetActionController } from '../controllers/widgets/Action.js';
+import { widgetCustomController } from "../controllers/widgets/Custom.js";
+import { catalogController } from "../controllers/catalog/Catalog.js";
+import { mediaManagerController } from "../controllers/media-manager/mediaManagerApi.js";
+import { thumbController } from "../controllers/media-manager/ThumbController.js";
+import { Adminizer } from "../lib/Adminizer.js";
+import timezones from "../controllers/timezones.js";
+import { NotificationController } from "../controllers/notifications/NotificationController.js";
 export default class Router {
     static onlyOnce = false;
     /**
@@ -67,7 +67,9 @@ export default class Router {
          * Edit form
          * */
         adminizer.app.all(`${adminizer.config.routePrefix}/form/:slug`, adminizer.policyManager.bindPolicies(policies, _form));
-        // Create a base entity route
+        /**
+         *  Create a base entity route
+         */
         let baseRoute = `${adminizer.config.routePrefix}/:entityType(form|model)/:entityName`;
         /**
          * Catalog
@@ -91,13 +93,13 @@ export default class Router {
         if (adminizer.config.notifications.enabled) {
             adminizer.app.get(`${adminizer.config.routePrefix}/notifications`, adminizer.policyManager.bindPolicies(policies, NotificationController.viewAll));
             adminizer.app.post(`${adminizer.config.routePrefix}/notifications`, adminizer.policyManager.bindPolicies(policies, NotificationController.viewAll));
-            adminizer.app.get(`${adminizer.config.routePrefix}/api/notifications/stream`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationsStream));
-            adminizer.app.get(`${adminizer.config.routePrefix}/api/notifications/get-classes`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationClasses));
-            adminizer.app.get(`${adminizer.config.routePrefix}/api/notifications/:notificationClass`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationsByClass));
-            adminizer.app.get(`${adminizer.config.routePrefix}/api/notifications`, adminizer.policyManager.bindPolicies(policies, NotificationController.getUserNotifications));
-            adminizer.app.put(`${adminizer.config.routePrefix}/api/notifications/:notificationClass/:id/read`, adminizer.policyManager.bindPolicies(policies, NotificationController.markAsRead));
-            adminizer.app.put(`${adminizer.config.routePrefix}/api/notifications/read-all`, adminizer.policyManager.bindPolicies(policies, NotificationController.markAllAsRead));
-            adminizer.app.post(`${adminizer.config.routePrefix}/api/notifications/search`, adminizer.policyManager.bindPolicies(policies, NotificationController.search));
+            adminizer.app.get(`${adminizer.config.routePrefix}/notifications/api/stream`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationsStream));
+            adminizer.app.get(`${adminizer.config.routePrefix}/notifications/api/get-classes`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationClasses));
+            adminizer.app.get(`${adminizer.config.routePrefix}/notifications/api/:notificationClass`, adminizer.policyManager.bindPolicies(policies, NotificationController.getNotificationsByClass));
+            adminizer.app.get(`${adminizer.config.routePrefix}/notifications/api`, adminizer.policyManager.bindPolicies(policies, NotificationController.getUserNotifications));
+            adminizer.app.put(`${adminizer.config.routePrefix}/notifications/api/:notificationClass/:id/read`, adminizer.policyManager.bindPolicies(policies, NotificationController.markAsRead));
+            adminizer.app.put(`${adminizer.config.routePrefix}/notifications/api/read-all`, adminizer.policyManager.bindPolicies(policies, NotificationController.markAllAsRead));
+            adminizer.app.post(`${adminizer.config.routePrefix}/notifications/api/search`, adminizer.policyManager.bindPolicies(policies, NotificationController.search));
         }
         /**
          * List of records

package/system/bindAccessRights.js

@@ -60,6 +60,13 @@ export default async function bindAccessRights(adminizer) {
         id: `widgets`, name: "Widgets",
         description: "Access to widgets", department: "Widgets"
     });
+    // Allow access login
+    adminizer.accessRightsHelper.registerToken({
+        id: 'access-to-adminpanel',
+        name: "Allowed log in",
+        description: "Are users allowed to log in to the admin panel?",
+        department: "Admin panel"
+    });
     // Default user group
     if (adminizer.config.registration && adminizer.config.registration.enable) {
         // TODO refactor CRUD functions for DataAccessor usage

package/system/bindAuthorization.js

@@ -1,7 +1,7 @@
-import _login from "../controllers/login";
-import _register from "../controllers/register";
-import _initUser from "../controllers/initUser";
-import { Adminizer } from "../lib/Adminizer";
+import _login from "../controllers/login.js";
+import _register from "../controllers/register.js";
+import _initUser from "../controllers/initUser.js";
+import { Adminizer } from "../lib/Adminizer.js";
 import { generate } from "password-hash";
 export default async function bindAuthorization(adminizer) {
     let admins;

package/system/bindControls.js

@@ -1,9 +1,9 @@
-import { CKeditor } from "../lib/controls/wysiwyg/CKeditor";
-import { ToastUiEditor } from "../lib/controls/markdown/ToastUiEditor";
-import { Handsontable } from "../lib/controls/table/Handsontable";
-import { JsonEditor } from "../lib/controls/jsoneditor/JsonEditor";
-import { MonacoEditor } from "../lib/controls/codeEditor/MonacoEditor";
-import { GeoEditor } from "../lib/controls/geojsoneditor/GeoEditor";
+import { CKeditor } from "../lib/controls/wysiwyg/CKeditor.js";
+import { ToastUiEditor } from "../lib/controls/markdown/ToastUiEditor.js";
+import { Handsontable } from "../lib/controls/table/Handsontable.js";
+import { JsonEditor } from "../lib/controls/jsoneditor/JsonEditor.js";
+import { MonacoEditor } from "../lib/controls/codeEditor/MonacoEditor.js";
+import { GeoEditor } from "../lib/controls/geojsoneditor/GeoEditor.js";
 export function bindControls(adminizer) {
     // bind wysiwyg
     adminizer.controlsHandler.add(new CKeditor(adminizer));

package/system/bindCors.d.ts

@@ -0,0 +1,2 @@
+import { Adminizer } from "../lib/Adminizer";
+export declare function bindCors(adminizer: Adminizer): void;

package/system/bindCors.js

@@ -0,0 +1,41 @@
+export function bindCors(adminizer) {
+    if (adminizer.config?.cors?.enabled) {
+        const corsConfig = adminizer.config.cors;
+        // Поддерживаем массив разрешенных origin
+        const allowedOrigins = Array.isArray(corsConfig.origin)
+            ? corsConfig.origin
+            : [corsConfig.origin];
+        adminizer.app.all(`${adminizer.config.routePrefix}/${corsConfig.path}`, (req, res, next) => {
+            const requestOrigin = req.headers.origin;
+            // Проверяем разрешен ли origin
+            const isOriginAllowed = !requestOrigin || allowedOrigins.includes(requestOrigin);
+            if (requestOrigin && !isOriginAllowed) {
+                console.log(`❌ CORS: Blocked request from ${requestOrigin}`);
+                if (req.method === 'OPTIONS') {
+                    // Для preflight - 200 без CORS headers
+                    return res.status(200).end();
+                }
+                else {
+                    // Для основных запросов - ошибка
+                    return res.status(403).json({
+                        error: 'CORS policy: Origin not allowed'
+                    });
+                }
+            }
+            // Запрос с разрешенного origin или без Origin
+            if (isOriginAllowed) {
+                // Для CORS запросов возвращаем тот же origin (или первый из списка)
+                const allowOrigin = requestOrigin || allowedOrigins[0];
+                res.header('Access-Control-Allow-Origin', allowOrigin);
+                res.header('Access-Control-Allow-Credentials', corsConfig.credentials !== false ? 'true' : 'false');
+                res.header('Access-Control-Allow-Methods', corsConfig.methods?.join(',') || 'GET,POST,PUT,DELETE,OPTIONS');
+                res.header('Access-Control-Allow-Headers', corsConfig.allowedHeaders?.join(',') || 'Content-Type,Authorization,X-Requested-With,X-CSRF-Token,x-xsrf-token');
+            }
+            if (req.method === 'OPTIONS') {
+                return res.status(200).end();
+            }
+            next();
+        });
+        console.log('✅ API CORS middleware enabled. Allowed origins:', allowedOrigins);
+    }
+}

package/system/bindDashboardWidgets.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { Adminizer } from '../lib/Adminizer';
+import { Adminizer } from '../lib/Adminizer.js';
 export default async function bindDashboardWidgets(adminizer) {
     if (adminizer.config.dashboard && typeof adminizer.config.dashboard !== "boolean" && adminizer.config.dashboard.autoloadWidgetsPath) {
         try {

package/system/bindForms.js

@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import { FormHelper } from "../helpers/formHelper";
+import { FormHelper } from "../helpers/formHelper.js";
 export default async function bindForms(adminizer) {
     if (fs.existsSync(adminizer.config.forms.path)) {
         let formsDir = fs.readdirSync(adminizer.config.forms.path);

package/system/bindInertia.js

@@ -1,8 +1,8 @@
-import flash from "../lib/inertia/flash";
-import inertia from "../lib/inertia/inertiaAdapter";
+import flash from "../lib/inertia/flash.js";
+import inertia from "../lib/inertia/inertiaAdapter.js";
 import fs from "fs";
 import path from "node:path";
-import { InertiaMenuHelper } from "../helpers/inertiaMenuHelper";
+import { InertiaMenuHelper } from "../helpers/inertiaMenuHelper.js";
 export function bindInertia(adminizer) {
     const viteRender = () => {
         if (process.env.VITE_ENV === 'dev') {
@@ -102,7 +102,7 @@ export function bindInertia(adminizer) {
             enabled: true,
             cookieName: 'XSRF-TOKEN',
             headerName: 'x-xsrf-token'
-        },
+        }
     }));
     adminizer.app.use((req, _, next) => {
         checkAuth(req, adminizer);