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

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/helpers/menuHelper.d.ts

@@ -3,6 +3,7 @@
  *
  * @constructor
  */
+import { UserAP } from "models/UserAP";
 import { ActionType, AdminpanelConfig, HrefConfig, ModelConfig } from "../interfaces/adminpanelConfig";
 export type MenuItem = {
     link: string;
@@ -60,5 +61,5 @@ export declare class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems(): MenuItem[];
+    getMenuItems(user: UserAP): MenuItem[];
 }

package/helpers/menuHelper.js

@@ -1,3 +1,4 @@
+import { GroupsAccessRightsHelper } from "./accessRightsHelper";
 export class MenuHelper {
     static config;
     constructor(config) {
@@ -98,7 +99,7 @@ export class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems() {
+    getMenuItems(user) {
         let menus = [];
         if (MenuHelper.config.navbar.additionalLinks && MenuHelper.config.navbar.additionalLinks.length > 0) {
             MenuHelper.config.navbar.additionalLinks.forEach(function (additionalLink) {
@@ -118,7 +119,12 @@ export class MenuHelper {
         }
         if (MenuHelper.config.models) {
             Object.entries(MenuHelper.config.models).forEach(function ([key, val]) {
-                if (!val.hide) {
+                const hide = typeof val.navbar?.visible === 'boolean'
+                    ? !val.navbar.visible
+                    : val.navbar?.groupsAccessRights
+                        ? !GroupsAccessRightsHelper.hasAccess(user, val.navbar.groupsAccessRights)
+                        : false;
+                if (!hide) {
                     if (val.tools && val.tools.length > 0 && val.tools[0].id !== "overview") {
                         val.tools.unshift({
                             id: "overview",

package/index.d.ts

@@ -1,6 +1,5 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-export * from "./lib/installStepper/installStepper";
 export * from "./lib/widgets/widgetHandler";
 export * from "./lib/catalog/CatalogHandler";
 export * from "./lib/media-manager/MediaManagerHandler";
@@ -8,4 +7,8 @@ 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/NavigationAP";

package/index.js

@@ -1,6 +1,5 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-export * from "./lib/installStepper/installStepper";
 export * from "./lib/widgets/widgetHandler";
 export * from "./lib/catalog/CatalogHandler";
 export * from "./lib/media-manager/MediaManagerHandler";
@@ -8,4 +7,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" | 
 /**
@@ -121,23 +123,6 @@ export interface AdminpanelConfig {
          * */
         set?: SetFunction;
     };
-    /**
-     * Wizards
-     * */
-    installStepper?: {
-        path: string;
-        data: {
-            [key: string]: FieldsModels;
-        };
-        /**
-         * Custom getter
-         * */
-        get?: GetFunction;
-        /**
-         * Custom setter
-         * */
-        set?: SetFunction;
-    };
     /**
      * Prime administrator login credentials
      * */
@@ -199,9 +184,18 @@ export interface ModelConfig {
      * */
     model: string;
     /**
-     * Hide entity in left navbar
+     * If the field is not definitely, then it will appear in Navbar
      * */
-    hide?: boolean;
+    navbar?: {
+        /**
+         * @default true
+         */
+        visible?: boolean;
+        /**
+         * For which it will be shown if not established will be shown to all groups who have the rights to read
+         */
+        groupsAccessRights?: string[];
+    };
     /**
      * Entity fields configuration
      * */
@@ -264,12 +258,12 @@ export interface ModelConfig {
      *  May be association or association-many to UserAP or GroupAP */
     userAccessRelation?: {
         field: string;
-        via: string;
+        via?: string;
     } | 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 +310,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';
@@ -403,7 +399,7 @@ export interface HrefConfig {
     /**
      * Only for view, controller still uses his own access rights token
      * */
-    accessRightsToken?: string;
+    accessRightsToken?: string | undefined;
     /**
      * For menu items only
      * */

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;
@@ -96,6 +75,9 @@ declare global {
         i18n: I18n;
     };
     type ResType = Response & {
+        /**
+         * @deprecated // TODO delete after finish catalog
+         */
         viewAdmin(specifiedPath: string, locals?: any, cb_view?: Function): void;
     };
     type MiddlewareType = (req: ReqType, res: ResType, next: NextFunction) => void;

package/interfaces/types.d.ts

@@ -1,6 +1,6 @@
 import { AbstractModel } from "../lib/v4/model/AbstractModel";
 import { ModelConfig } from "./adminpanelConfig";
-export type EntityType = "form" | "model" | "wizard";
+export type EntityType = "form" | "model";
 export interface Entity {
     name: string;
     config?: ModelConfig;

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,8 +43,9 @@ export class Adminizer {
     widgetHandler;
     vite;
     controlsHandler;
+    jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
-        level: "info",
+        level: process.env.LOG_LEVEL ?? "debug",
         format: winston.format.combine(winston.format.timestamp(), winston.format.printf(({ timestamp, level, message, ...meta }) => {
             const metaString = Object.keys(meta).length ? JSON.stringify(meta) : "";
             return `[${timestamp}] ${level.toUpperCase()}: ${message} ${metaString}`;
@@ -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
@@ -76,6 +93,9 @@ export class Adminizer {
     async init(config) {
         // set cookie parser
         this.app.use(cookieParser());
+        if (!config || Object.keys(config).length === 0) {
+            Adminizer.log.warn(`Adminizer init > Adminizer config is emtpy`);
+        }
         // Set vite middleware
         const isViteDev = process.env.VITE_ENV === "dev";
         if (isViteDev)
@@ -105,7 +125,6 @@ export class Adminizer {
                 set: configForms.set ?? defaultForms.set
             }
         };
-        // console.log("CONFIG", this.config)
         this.modelHandler = new ModelHandler();
         await bindModels(this);
         await bindForms(this);
@@ -113,17 +132,18 @@ export class Adminizer {
         this.policyManager = new PolicyManager(this);
         await this.policyManager.loadPolicies();
         this.accessRightsHelper = new AccessRightsHelper(this);
+        // Helpers go to construtor
         this.configHelper = new ConfigHelper(this);
         this.menuHelper = new MenuHelper(this.config);
         this.widgetHandler = new WidgetHandler(this);
         bindExpressUtils(this.app);
         bindReqFunctions(this);
-        // add install stepper policy to check unfilled settings
-        // bindInstallStepper(this); // TODO It is necessary to provide an opportunity to be inserted by an intermediary after authorization, but before the admin panel, in order to block the user from managing the Installstepper's admin panel.
         // Bind assets
         bindAssets(this.app, this.config.routePrefix);
-        if ((process.env.DEV && process.env.NODE_ENV !== 'production') || process.env.ADMINPANEL_FORCE_BIND_DEV === "TRUE") {
-            bindDev(this);
+        if (!process.env.VITEST) {
+            if ((process.env.DEV && process.env.NODE_ENV !== 'production') || process.env.ADMINPANEL_FORCE_BIND_DEV === "TRUE") {
+                bindDev(this);
+            }
         }
         await bindDashboardWidgets(this);
         // bindNavigation(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

@@ -140,7 +140,6 @@
 // 				{tree: tree}
 // 			)
 // 		} catch (e) {
-// 			console.log(e)
 // 			throw 'navigation model update error'
 // 		}
 // 	}
@@ -326,7 +325,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 +353,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 +432,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 +459,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 +495,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 +513,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;
                     }
                 }
@@ -132,10 +131,9 @@ export class NodeTable {
     async output(callback, dataAccessor) {
         try {
             const queryOptions = await this.buildQuery();
-            const totalRecords = await this.model.count({});
-            const filteredRecords = await this.model.count(queryOptions.where);
+            const totalRecords = await this.model.count({}, dataAccessor);
+            const filteredRecords = await this.model.count(queryOptions.where, dataAccessor);
             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/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/media-manager/Items.js

@@ -324,12 +324,9 @@
 //   try {
 //     await fs.promises.access(file);
 //     await fs.promises.unlink(file);
-//     console.log('The file was successfully deleted');
 //   } catch (err) {
 //     if (err.code === 'ENOENT') {
-//       console.log('The file does not exist');
 //     } else if (err.code === 'EPERM') {
-//       console.log('You do not have permission to delete this file');
 //     } else {
 //       console.error(`An error occurred: ${err}`);
 //     }

package/lib/v4/DataAccessor.d.ts

@@ -4,13 +4,16 @@
 import { Entity } from "../../interfaces/types";
 import { ActionType } from "../../interfaces/adminpanelConfig";
 import { Fields } from "../../helpers/fieldsHelper";
+import { Adminizer } from "../Adminizer";
+import { UserAP } from "models/UserAP";
 export declare class DataAccessor {
     private readonly adminizer;
-    user: ModelsAP["UserAP"];
+    user: UserAP;
     entity: Entity;
     action: ActionType;
     private fields;
-    constructor(req: ReqType, entity: Entity, action: ActionType);
+    private actionVerb;
+    constructor(adminizer: Adminizer, user: UserAP, entity: Entity, action: ActionType);
     /**
      * Retrieves the fields for the given entity based on action type,
      * taking into account access rights and configuration settings.

package/lib/v4/DataAccessor.js

@@ -6,11 +6,13 @@ export class DataAccessor {
     entity;
     action;
     fields = null;
-    constructor(req, entity, action) {
-        this.adminizer = req.adminizer;
-        this.user = req.session.UserAP;
+    actionVerb;
+    constructor(adminizer, user, entity, action) {
+        this.adminizer = adminizer;
+        this.user = user;
         this.entity = entity;
         this.action = action;
+        this.actionVerb = getTokenAction(this.action);
     }
     /**
      * Retrieves the fields for the given entity based on action type,
@@ -26,10 +28,20 @@ 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 tokenId = `${this.actionVerb}-${this.entity.model.modelname}-${this.entity.type}`;
+        if (!this.adminizer.accessRightsHelper.hasPermission(tokenId, this.user)) {
+            Adminizer.log.debug(`No access rights to ${this.entity.type}: ${this.entity.model.modelname}`);
+            return undefined;
+        }
         const result = {};
         Object.entries(modelAttributes).forEach(([key, modelField]) => {
+            console.log(key);
+            // The fields that are recorded separately from the connection in some ORMs, because they are processed at the level above them.
+            if (modelAttributes[key].primaryKeyForAssociation === true) {
+                return undefined;
+            }
             // Checks for short type in Waterline: fieldName: 'string'
             if (typeof modelField === "string") {
                 modelField = { type: modelField };
@@ -66,13 +78,18 @@ export class DataAccessor {
             let populatedModelFieldsConfig = {};
             if (modelField.type === "association" || modelField.type === "association-many") {
                 const modelName = modelField.model || modelField.collection;
+                const tokenId = `read-${modelName}-${this.entity.type}`;
+                if (!this.adminizer.accessRightsHelper.hasPermission(tokenId, this.user)) {
+                    Adminizer.log.silly(`No access rights to ${this.entity.type}: ${this.entity.model.modelname}`);
+                    return undefined;
+                }
                 if (modelName) {
-                    const Model = this.adminizer.modelHandler.model.get(modelName);
-                    if (Model) {
+                    const model = this.adminizer.modelHandler.model.get(modelName);
+                    if (model) {
                         populatedModelFieldsConfig = this.getAssociatedFieldsConfig(modelName);
                     }
                     else {
-                        Adminizer.log.error(`Model not found: ${modelName}`);
+                        Adminizer.log.error(`DataAccessor > getFieldsConfig > Model not found: ${modelName} when ${key}`);
                     }
                 }
             }
@@ -94,10 +111,9 @@ export class DataAccessor {
             return undefined;
         }
         // Check if user has access to the associated model
-        const actionVerb = getTokenAction(this.action);
-        const tokenId = `${actionVerb}-${modelName}-${this.entity.type}`;
+        const tokenId = `${this.actionVerb}-${modelName}-${this.entity.type}`;
         if (!this.adminizer.accessRightsHelper.hasPermission(tokenId, this.user)) {
-            Adminizer.log.warn(`No access rights to ${this.entity.type}: ${modelName}`);
+            Adminizer.log.debug(`No access rights to ${this.entity.type}: ${modelName}`);
             return undefined;
         }
         const associatedFields = {};
@@ -327,7 +343,7 @@ export class DataAccessor {
                     throw new Error(`No intermediate record found in model "${intermediateRelation.model}" associated with user ID "${this.user.id}"`);
                 }
                 // Ensure there is only one associated intermediate record
-                const intermediateRecordCount = await intermediateModel.count({ [via]: this.user.id });
+                const intermediateRecordCount = await intermediateModel.count({ [via]: this.user.id }, this);
                 if (intermediateRecordCount > 1) {
                     throw new Error(`Multiple intermediate records found in model "${intermediateRelation.model}" associated with user ID "${this.user.id}". ` +
                         `Expected only one`);
@@ -363,10 +379,11 @@ export class DataAccessor {
                 const relation = modelAttributes[accessField];
                 if (relation && ['userap', 'groupap'].includes(relation.model.toLowerCase())) {
                     if (relation.model.toLowerCase() === 'userap') {
-                        updatedRecord[accessField] = this.user.id;
+                        if (!this.user.isAdministrator) {
+                            updatedRecord[accessField] = this.user.id;
+                        }
                     }
                     else if (relation.model.toLowerCase() === 'groupap') {
-                        // Works only for users with only one group, later it can be resolved with group weight
                         const userGroups = this.user.groups || [];
                         if (userGroups.length === 1) {
                             updatedRecord[accessField] = userGroups[0].id;
@@ -409,7 +426,7 @@ export class DataAccessor {
                     throw new Error(`No intermediate record found in model "${intermediateRelation.model}" linking user "${this.user.id}" to the main record`);
                 }
                 // Ensure there is only one associated intermediate record
-                const intermediateRecordCount = await intermediateModel.count({ [via]: this.user.id });
+                const intermediateRecordCount = await intermediateModel.count({ [via]: this.user.id }, this);
                 if (intermediateRecordCount > 1) {
                     throw new Error(`Multiple intermediate records found in model "${intermediateRelation.model}" associated with user ID "${this.user.id}". ` +
                         `Expected only one`);

package/lib/v4/I18n.js

@@ -104,7 +104,9 @@ export class I18n {
             return;
         const file = this.locateFile(locale);
         const tmpFile = `${file}.tmp`;
+        const dir = path.dirname(file);
         try {
+            fs.mkdirSync(dir, { recursive: true });
             fs.writeFileSync(tmpFile, JSON.stringify(I18n.locales[locale], null, this.indent), "utf8");
             fs.renameSync(tmpFile, file);
         }

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);
         }
     }