adminizer 4.1.0-commit.ad1476a → 4.1.1

package/lib/v4/model/adapter/waterline.js

@@ -48,7 +48,6 @@ export class WaterlineModel extends AbstractModel {
             query = query.limit(options.limit);
         }
         let result = await query;
-        console.log(result, "result");
         return result;
     }
     async _updateOne(criteria, data) {
@@ -91,10 +90,13 @@ export class WaterlineAdapter extends AbstractAdapter {
     /** Method that processes custom waterline model creation. Is used for system models. Replaces beforeCreate method in waterline */
     static async registerSystemModels(waterlineORM) {
         const systemModelsDir = path.resolve(import.meta.dirname, "../../../../models");
-        const systemModelsFiles = fs.readdirSync(systemModelsDir).filter(file => file.endsWith(".js"));
+        let systemModelsFiles = fs.readdirSync(systemModelsDir).filter(file => file.endsWith(".js"));
+        if (!systemModelsFiles.length) {
+            systemModelsFiles = fs.readdirSync(systemModelsDir).filter(file => file.endsWith(".ts") && !file.endsWith(".d.ts"));
+        }
         // Register adminizer system models
         await Promise.all(systemModelsFiles.map(async (file) => {
-            const modelName = path.basename(file, ".js");
+            const modelName = path.basename(file).replace(/\.(ts|js)$/, "");
             const systemModelPath = path.resolve(systemModelsDir, file);
             const adminizerModel = (await import(pathToFileURL(systemModelPath).href)).default;
             const waterlineLikeModel = generateWaterlineModel(modelName, adminizerModel);

package/lib/{widgets → v4/widgets}/abstractAction.d.ts

@@ -1,7 +1,7 @@
 import BaseWidget from "./abstractWidgetBase";
 export default abstract class ActionBase extends BaseWidget {
     readonly widgetType = "action";
-    /** Widget background css (color, Image) */
+    /** Widget background css color */
     abstract readonly backgroundCSS: string | null;
     abstract action(): Promise<any>;
 }

package/lib/v4/widgets/abstractCustom.d.ts

@@ -0,0 +1,28 @@
+import { MaterialIcon } from "material-icons";
+export default abstract class CustomBase {
+    /** Widget unique id */
+    abstract readonly id: string;
+    /** Widget Name */
+    abstract readonly name: string;
+    /** JS module file path */
+    abstract readonly jsPath: {
+        dev: string;
+        production: string;
+    };
+    /** For group access rights by department */
+    abstract readonly department: string;
+    /** Widget background css color */
+    readonly backgroundCSS: string;
+    /** Widget size */
+    abstract readonly size: {
+        h: number;
+        w: number;
+    } | null;
+    /** Widget description */
+    abstract readonly description: string;
+    /** Widget icon */
+    abstract readonly icon?: MaterialIcon | string;
+    readonly widgetType: 'custom';
+    routePrefix: string;
+    protected constructor(routePrefix: string);
+}

package/lib/v4/widgets/abstractCustom.js

@@ -0,0 +1,9 @@
+export default class CustomBase {
+    /** Widget background css color */
+    backgroundCSS;
+    widgetType = 'custom';
+    routePrefix;
+    constructor(routePrefix) {
+        this.routePrefix = routePrefix;
+    }
+}

package/lib/{widgets → v4/widgets}/abstractInfo.d.ts

@@ -1,7 +1,7 @@
 import BaseWidget from "./abstractWidgetBase";
 export default abstract class InfoBase extends BaseWidget {
     readonly widgetType = "info";
-    /** Widget background css (color, Image) */
+    /** Widget background css color */
     readonly backgroundCSS: string;
     /** Widget size */
     readonly size: {

package/lib/{widgets → v4/widgets}/abstractInfo.js

@@ -1,7 +1,7 @@
 import BaseWidget from "./abstractWidgetBase";
 export default class InfoBase extends BaseWidget {
     widgetType = "info";
-    /** Widget background css (color, Image) */
+    /** Widget background css color */
     backgroundCSS;
     /** Widget size */
     size = null;

package/lib/{widgets → v4/widgets}/abstractLink.d.ts

@@ -1,10 +1,11 @@
 import BaseWidget from "./abstractWidgetBase";
-import { MaterialIcon } from "../../interfaces/MaaterialIcons";
+import { MaterialIcon } from "../../../interfaces/MaaterialIcons";
 export interface Links {
     name: string;
     description: string;
     icon?: MaterialIcon;
     link: string;
+    linkType: 'self' | 'blank';
     backgroundCSS: string | null;
 }
 export default abstract class LinkBase extends BaseWidget {

package/lib/{widgets → v4/widgets}/abstractSwitch.d.ts

@@ -1,7 +1,7 @@
 import BaseWidget from "./abstractWidgetBase";
 export default abstract class SwitchBase extends BaseWidget {
     readonly widgetType = "switcher";
-    /** Widget background css (color, Image) */
+    /** Widget background css color */
     abstract readonly backgroundCSS: string | null;
     /** Get current state */
     abstract getState(): Promise<boolean>;

package/lib/{widgets → v4/widgets}/abstractWidgetBase.d.ts

@@ -1,4 +1,4 @@
-import { MaterialIcon } from "../../interfaces/MaaterialIcons";
+import { MaterialIcon } from "../../../interfaces/MaaterialIcons";
 export default abstract class BaseWidget {
     /** Widget unique id */
     abstract readonly id: string;
@@ -23,5 +23,5 @@ export default abstract class BaseWidget {
     /** Run task */
     "action" | 
     /** Change location, or open in new tab */
-    "link" | "custom";
+    "link";
 }

package/lib/{widgets → v4/widgets}/widgetHandler.d.ts

@@ -3,8 +3,10 @@ import InfoBase from "./abstractInfo";
 import ActionBase from "./abstractAction";
 import LinkBase from "./abstractLink";
 import CustomBase from "./abstractCustom";
-import { AdminpanelIcon } from "../../interfaces/adminpanelConfig";
-import { Adminizer } from "../Adminizer";
+import { AdminpanelIcon } from "../../../interfaces/adminpanelConfig";
+import { Adminizer } from "../../Adminizer";
+import { UserAP } from "models/UserAP";
+import { I18n } from "../I18n";
 export type WidgetType = (SwitcherBase | InfoBase | ActionBase | LinkBase | CustomBase);
 export interface WidgetConfig {
     id: string;
@@ -16,6 +18,7 @@ export interface WidgetConfig {
     name: string;
     backgroundCSS: string;
     scriptUrl?: string;
+    linkType?: 'self' | 'blank';
     constructorName?: string;
     constructorOption?: any;
     size?: {
@@ -25,6 +28,21 @@ export interface WidgetConfig {
     added?: boolean;
     hideAdminPanelUI?: boolean;
 }
+export interface WidgetLayoutItem {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+    i: string;
+    id: string;
+}
+export interface WidgetsLayouts {
+    lg: WidgetLayoutItem[];
+    md: WidgetLayoutItem[];
+    sm: WidgetLayoutItem[];
+    xs: WidgetLayoutItem[];
+    xxs: WidgetLayoutItem[];
+}
 export declare class WidgetHandler {
     private widgets;
     adminizer: Adminizer;
@@ -32,7 +50,13 @@ export declare class WidgetHandler {
     add(widget: WidgetType): void;
     getById(id: string): WidgetType | undefined;
     removeById(id: string): void;
-    getAll(user: ModelsAP["UserAP"]): Promise<WidgetConfig[]>;
-    getWidgetsDB(id: number, auth: boolean): Promise<WidgetConfig[]>;
-    setWidgetsDB(id: number, widgets: WidgetConfig[], auth: boolean): Promise<number>;
+    getAll(user: UserAP, i18n: I18n): Promise<WidgetConfig[]>;
+    getWidgetsDB(id: number, auth: boolean, i18n: I18n): Promise<{
+        widgets: WidgetConfig[];
+        layout: WidgetsLayouts;
+    }>;
+    setWidgetsDB(id: number, body: {
+        widgets: WidgetConfig[];
+        layout: WidgetLayoutItem[];
+    }, auth: boolean): Promise<number>;
 }

package/lib/{widgets → v4/widgets}/widgetHandler.js

@@ -3,6 +3,7 @@ import InfoBase from "./abstractInfo";
 import ActionBase from "./abstractAction";
 import LinkBase from "./abstractLink";
 import CustomBase from "./abstractCustom";
+import * as process from "node:process";
 export class WidgetHandler {
     widgets = [];
     adminizer;
@@ -34,7 +35,7 @@ export class WidgetHandler {
             }
         }
     }
-    getAll(user) {
+    getAll(user, i18n) {
         let widgets = [];
         if (this.widgets.length) {
             let id_key = 0;
@@ -45,9 +46,9 @@ export class WidgetHandler {
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
                             api: `${this.adminizer.config.routePrefix}/widgets-switch/${widget.id}`,
-                            description: widget.description,
+                            description: i18n.__(widget.description),
                             icon: widget.icon,
-                            name: widget.name,
+                            name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null
                         });
@@ -59,9 +60,9 @@ export class WidgetHandler {
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
                             api: `${this.adminizer.config.routePrefix}/widgets-info/${widget.id}`,
-                            description: widget.description,
+                            description: i18n.__(widget.description),
                             icon: widget.icon,
-                            name: widget.name,
+                            name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null
                         });
@@ -73,9 +74,9 @@ export class WidgetHandler {
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
                             api: `${this.adminizer.config.routePrefix}/widgets-action/${widget.id}`,
-                            description: widget.description,
+                            description: i18n.__(widget.description),
                             icon: widget.icon,
-                            name: widget.name,
+                            name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null
                         });
@@ -86,10 +87,11 @@ export class WidgetHandler {
                         let links_id_key = 0;
                         for (const link of widget.links) {
                             widgets.push({
-                                name: link.name,
+                                name: i18n.__(link.name),
                                 id: `${widget.id}__${links_id_key}`,
                                 type: 'link',
-                                description: link.description,
+                                linkType: link.linkType,
+                                description: i18n.__(link.description),
                                 link: link.link,
                                 icon: link.icon,
                                 backgroundCSS: link.backgroundCSS
@@ -104,15 +106,12 @@ export class WidgetHandler {
                             id: `${widget.id}_${id_key}`,
                             type: widget.widgetType,
                             api: `${this.adminizer.config.routePrefix}/widgets-custom/${widget.id}`,
-                            description: widget.description,
+                            description: i18n.__(widget.description),
                             icon: widget.icon,
-                            name: widget.name,
+                            name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null,
-                            scriptUrl: widget.scriptUrl,
-                            constructorName: widget.constructorName,
-                            constructorOption: widget.constructorOption,
-                            hideAdminPanelUI: widget.hideAdminPanelUI
+                            scriptUrl: process.env.VITE_ENV === 'dev' ? widget.jsPath.dev : widget.jsPath.production,
                         });
                     }
                 }
@@ -123,9 +122,9 @@ export class WidgetHandler {
         }
         return Promise.resolve(widgets);
     }
-    async getWidgetsDB(id, auth) {
+    async getWidgetsDB(id, auth, i18n) {
         let user;
-        let widgets;
+        let result = { widgets: [], layout: { lg: [], md: [], sm: [], xs: [], xxs: [] } };
         if (!auth) {
             // TODO refactor CRUD functions for DataAccessor usage
             user = await this.adminizer.modelHandler.model.get("UserAP")?.["_findOne"]({ login: this.adminizer.config.administrator?.login ?? 'admin' });
@@ -134,11 +133,11 @@ export class WidgetHandler {
             // TODO refactor CRUD functions for DataAccessor usage
             user = await this.adminizer.modelHandler.model.get("UserAP")?.["_findOne"]({ id: id });
         }
-        if (!user || !user.widgets || user.widgets.length === 0) {
+        if (!user || !user.widgets || user.widgets.widgets.length === 0) {
             if (this.adminizer.config.dashboard && typeof this.adminizer.config.dashboard !== "boolean" && this.adminizer.config.dashboard.defaultWidgets) {
                 let defaultWidgets = this.adminizer.config.dashboard.defaultWidgets;
-                widgets = await this.getAll(user);
-                widgets.forEach(widget => {
+                result.widgets = await this.getAll(user, i18n);
+                result.widgets.forEach(widget => {
                     if (defaultWidgets.includes(widget.id.split("__")[0])) {
                         widget.added = true;
                     }
@@ -146,19 +145,20 @@ export class WidgetHandler {
             }
         }
         else {
-            widgets = user.widgets;
+            result.widgets = user.widgets.widgets;
+            result.layout = user.widgets.layout;
         }
-        return widgets;
+        return result;
     }
-    async setWidgetsDB(id, widgets, auth) {
+    async setWidgetsDB(id, body, auth) {
         if (!auth) {
             // TODO refactor CRUD functions for DataAccessor usage
-            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ login: this.adminizer.config.administrator?.login ?? 'admin' }, { widgets: widgets });
+            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ login: this.adminizer.config.administrator?.login ?? 'admin' }, { widgets: body });
             return updatedUser.id;
         }
         else {
             // TODO refactor CRUD functions for DataAccessor usage
-            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ id: id }, { widgets: widgets });
+            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ id: id }, { widgets: body });
             return updatedUser.id;
         }
     }

package/models/GroupAP.d.ts

@@ -1,3 +1,4 @@
+import { UserAP } from "./UserAP";
 declare const _default: {
     id: {
         type: string;
@@ -21,3 +22,10 @@ declare const _default: {
     };
 };
 export default _default;
+export interface GroupAP {
+    id: number;
+    name: string;
+    description?: string;
+    tokens?: string[];
+    users?: UserAP[];
+}

package/models/NavigationAP.d.ts

@@ -1,14 +1,13 @@
 declare const _default: {
     id: {
         type: string;
-        allowNull: boolean;
-        uuid: boolean;
+        autoIncrement: boolean;
         primaryKey: boolean;
-        required: boolean;
     };
     label: {
         type: string;
         required: boolean;
+        unique: boolean;
     };
     tree: {
         type: string;
@@ -16,3 +15,8 @@ declare const _default: {
     };
 };
 export default _default;
+export interface NavigationAP {
+    id: string;
+    label: string;
+    tree: Record<string, unknown>;
+}

package/models/NavigationAP.js

@@ -1,14 +1,13 @@
 export default {
     id: {
-        type: "string",
-        allowNull: false,
-        uuid: true,
-        primaryKey: true,
-        required: true
+        type: "number",
+        autoIncrement: true,
+        primaryKey: true
     },
     label: {
         type: "string",
-        required: true
+        required: true,
+        unique: true
     },
     tree: {
         type: "json",

package/models/UserAP.d.ts

@@ -1,3 +1,5 @@
+import { WidgetConfig, WidgetsLayouts } from "lib/v4/widgets/widgetHandler";
+import { GroupAP } from "./GroupAP";
 declare const _default: {
     id: {
         type: string;
@@ -16,10 +18,10 @@ declare const _default: {
     email: {
         type: string;
     };
-    passwordHashed: {
+    avatar: {
         type: string;
     };
-    password: {
+    passwordHashed: {
         type: string;
     };
     timezone: {
@@ -52,3 +54,23 @@ declare const _default: {
     };
 };
 export default _default;
+export interface UserAP {
+    id: number;
+    login: string;
+    fullName?: string;
+    email?: string;
+    avatar?: string;
+    passwordHashed?: string;
+    timezone?: string;
+    expires?: string;
+    locale?: string;
+    isDeleted?: boolean;
+    isActive?: boolean;
+    isAdministrator?: boolean;
+    groups?: GroupAP[];
+    widgets?: {
+        widgets: WidgetConfig[];
+        layout: WidgetsLayouts;
+    };
+    isConfirmed?: boolean;
+}

package/models/UserAP.js

@@ -16,10 +16,10 @@ export default {
     email: {
         type: "string"
     },
-    passwordHashed: {
+    avatar: {
         type: "string"
     },
-    password: {
+    passwordHashed: {
         type: "string"
     },
     timezone: {

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.1.0-commit.ad1476a",
+  "version": "4.1.1",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "test": "vitest --reporter verbose",
+    "start": "cross-env NO_SEED_DATA=true ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "dev": "cross-env VITE_ENV=dev tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:sequelize": "cross-env VITE_ENV=dev NO_SEED_DATA=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "build:assets": "vite build",
     "compile:backend": "tsc -p src/tsconfig.json",
     "watch:backend": "tsc -w -p src/tsconfig.json",
@@ -15,21 +16,24 @@
     "build": "npm run copy:backend && npm run compile:backend && npm run build:assets",
     "build:module": "vite build --config modules/test/vite.config.module.ts",
     "build:react-quill": "vite build --config modules/controls/wysiwyg/vite.config.react-quill.ts",
+    "build:catalog-modules": "vite build --config modules/testCatalog/vite.config.module.ts",
     "copy:modules": "node copy-modules.js",
     "build:assets:modules": "npm run build:assets && npm run copy:modules",
-    "start:seed": "cross-env SEED_DATA=true tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "start:seed": "cross-env ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "demo:build": "npm run copy:backend && npm run compile:backend && npm run build:assets && npm run copy:modules",
-    "demo": "cross-env SEED_DATA=true DEMO=true tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts"
+    "demo": "cross-env ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "description": "",
   "dependencies": {
-    "@radix-ui/react-menubar": "^1.1.12",
+    "@minoru/react-dnd-treeview": "^3.5.2",
+    "@radix-ui/react-context-menu": "^2.2.15",
     "body-parser": "^1.20.3",
     "chalk": "^5.4.1",
     "cmdk": "^1.1.1",
+    "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "crypto-puzzle": "^5.0.2",
@@ -37,17 +41,22 @@
     "ejs": "^3.1.10",
     "express": "^4.21.2",
     "express-session": "^1.18.1",
-    "ky": "^1.8.0",
+    "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
     "next-themes": "^0.4.6",
     "password-hash": "^1.2.2",
+    "react-dnd": "^16.0.1",
     "sharp": "^0.33.5",
     "typeorm": "^0.3.20",
     "uuid": "^11.0.5",
+    "waterline": "^0.15.2",
     "winston": "^3.17.0"
   },
   "devDependencies": {
+    "isomorphic-webcrypto": "^2.3.8",
+    "@babel/plugin-proposal-decorators": "^7.27.1",
     "@ckeditor/ckeditor5-react": "^9.5.0",
+    "@eslint/compat": "^1.2.9",
     "@faker-js/faker": "^9.7.0",
     "@handsontable/react": "^15.2.0",
     "@inertiajs/react": "^2.0.0",
@@ -58,11 +67,14 @@
     "@radix-ui/react-dialog": "^1.1.7",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-label": "^2.1.2",
+    "@radix-ui/react-menubar": "^1.1.12",
     "@radix-ui/react-popover": "^1.1.7",
+    "@radix-ui/react-portal": "^1.1.6",
     "@radix-ui/react-select": "^2.1.6",
     "@radix-ui/react-separator": "^1.1.3",
     "@radix-ui/react-slider": "^1.2.3",
     "@radix-ui/react-slot": "^1.2.0",
+    "@radix-ui/react-switch": "^1.2.4",
     "@radix-ui/react-tooltip": "^1.1.8",
     "@tailwindcss/vite": "^4.0.15",
     "@tanstack/react-table": "^8.21.2",
@@ -73,22 +85,27 @@
     "@types/express-session": "^1.18.1",
     "@types/he": "^1.2.3",
     "@types/json-schema": "^7.0.15",
+    "@types/jsonwebtoken": "^9.0.9",
     "@types/leaflet": "^1.9.17",
+    "@types/lodash": "^4.17.17",
     "@types/lodash-es": "^4.17.12",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.10.5",
     "@types/password-hash": "^1.2.24",
     "@types/react": "^19.0.3",
     "@types/react-dom": "^19.0.2",
+    "@types/react-grid-layout": "^1.3.5",
     "@types/sprintf-js": "^1.1.4",
     "@types/uuid": "^10.0.0",
     "@types/waterline": "^0.13.9",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
     "@vitejs/plugin-react": "^4.3.4",
     "babel-plugin-react-compiler": "^19.0.0-beta-e993439-20250405",
     "ckeditor5": "^45.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cross-env": "^7.0.3",
+    "eslint": "^9.26.0",
     "handsontable": "^15.2.0",
     "json-schema": "^0.4.0",
     "leaflet": "^1.9.4",
@@ -99,15 +116,19 @@
     "react": "^19.0.0",
     "react-day-picker": "^8.10.1",
     "react-dom": "^19.0.0",
+    "react-grid-layout": "^1.5.1",
     "react-intersection-observer": "^9.16.0",
     "react-leaflet": "^5.0.0",
     "react-quill-new": "^3.4.6",
     "react-simple-wysiwyg": "^3.2.2",
     "sails-disk": "^2.1.2",
     "sails-postgresql": "^5.0.1",
+    "sequelize": "^6.37.5",
+    "sequelize-typescript": "^2.1.6",
     "shelljs": "^0.9.2",
     "sonner": "^2.0.3",
     "sprintf-js": "^1.1.3",
+    "sqlite3": "^5.1.7",
     "tailwind-merge": "^3.0.2",
     "tailwindcss": "^4.0.15",
     "tsx": "^4.19.3",
@@ -117,9 +138,6 @@
     "vite": "^6.1.0",
     "vite-plugin-externals": "^0.6.2",
     "vite-plugin-full-reload": "^1.2.0",
-    "waterline": "^0.15.2",
-    "sqlite3": "^5.1.7",
-    "sequelize": "^6.37.5",
-    "sequelize-typescript": "^2.1.6"
+    "vitest": "^3.0.7"
   }
 }

package/policies/checkAuth.js

@@ -4,12 +4,13 @@ export default async function checkAuth(req, res, proceed) {
         locale = req.adminizer.config.translation.defaultLocale;
     }
     if (!req.adminizer.config.auth.enable) {
-        if (req.session.UserAP) {
-            req.session.UserAP.isAdministrator = true;
+        if (req.user) {
+            req.user.isAdministrator = true;
         }
         else {
-            req.session.UserAP = {
+            req.user = {
                 id: 0,
+                login: "No Auth",
                 isAdministrator: true,
                 locale: locale
             };

package/policies/setLocale.js

@@ -5,8 +5,8 @@ export default async function setLocale(req, res, proceed) {
     if (typeof req.adminizer.config.translation === 'boolean') {
         return proceed();
     }
-    if (req.session.UserAP && req.session.UserAP.locale) {
-        req.i18n.setLocale(req.session.UserAP.locale);
+    if (req.user && req.user.locale) {
+        req.i18n.setLocale(req.user.locale);
     }
     else {
         req.i18n.setLocale(req.adminizer.config.translation.defaultLocale);