adminizer 4.1.0-build.10 → 4.1.0-build.12

package/Readme.md

@@ -2,7 +2,6 @@
 
 <span class="badge-npmversion"><a href="https://npmjs.org/package/adminizer" title="View this project on NPM"><img src="https://img.shields.io/npm/v/adminizer.svg" alt="NPM version" /></a></span>
 
-
 Adminizer is a modern admin panel built as an independent module for Node.js.  
 The backend is written in TypeScript, and the frontend uses React, providing high modularity and flexibility.  
 The system is specifically designed to be **framework- and ORM-agnostic**, running directly inside the Node.js Runtime.  
@@ -11,6 +10,17 @@ Thanks to this approach, Adminizer can be integrated into any server-side applic
 The project is **open-source**, **free to use**, and focused on building an **open community**.  
 We would like to express special thanks to **Konstantin Zolotarev**, who laid the foundation with the **sails-adminpanel** project, which we later reworked and generalized.
 
+---
+
+Follow us for updates, tutorials, and community discussions:
+
+[![Telegram](https://img.shields.io/badge/Telegram-Join%20Chat-blue?logo=telegram)](https://t.me/talks_adminizer)
+[![X / Twitter](https://img.shields.io/badge/X-%40admnzr-000000?logo=twitter)](https://x.com/admnzr)
+[![Facebook](https://img.shields.io/badge/Facebook-Adminizer-blue?logo=facebook)](https://www.facebook.com/profile.php?id=61575683442665)
+
+---
+
+
 The core principle of Adminizer is **maximum extensibility**.  
 The admin panel can be configured and expanded **at runtime** without requiring rebuilds or server restarts.  
 We aimed to make the system as easy to integrate as possible: just install the package and immediately gain access to a powerful admin interface.  

package/controllers/add.js

@@ -14,10 +14,10 @@ export default async function add(req, res) {
         return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/${entity.uri}`);
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/addGroup.js

@@ -4,10 +4,10 @@ import { inertiaGroupHelper } from "../helpers/inertiaGroupHelper";
 export default async function addGroup(req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/addUser.js

@@ -5,10 +5,10 @@ import { inertiaUserHelper } from "../helpers/inertiaUserHelper";
 export default async function (req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/catalog/Catalog.js

@@ -6,10 +6,10 @@ export async function catalogController(req, res) {
     let id = req.params.id ? req.params.id : '';
     const postfix = id ? `${slug}-${id}` : `${slug}`;
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${postfix}`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${postfix}`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/catalog/FrontentCatalogAdapter.js

@@ -38,7 +38,7 @@ export class VueCatalog {
             obj[actionHandler.name] = "";
         }
         let messages = obj;
-        req.i18n.setLocale(req.session.UserAP.locale);
+        req.i18n.setLocale(req.user.locale);
         let outMessages = {};
         for (const mess of Object.keys(messages)) {
             outMessages[mess] = req.i18n.__(mess);

package/controllers/ckeditorUpload.js

@@ -4,7 +4,7 @@ import { Adminizer } from "../lib/Adminizer";
 export default function upload(req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
             return;
         }
@@ -13,7 +13,7 @@ export default function upload(req, res) {
             `create-${entity.name}-model`,
             `update-${entity.name}-form`,
             `create-${entity.name}-form`
-        ], req.session.UserAP)) {
+        ], req.user)) {
             res.sendStatus(403);
             return;
         }

package/controllers/dashboard.js

@@ -1,5 +1,5 @@
 export default function (req, res) {
-    if (req.adminizer.config.auth.enable && !req.session.UserAP) {
+    if (req.adminizer.config.auth.enable && !req.user) {
         return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
     }
     return req.Inertia.render({

package/controllers/edit.js

@@ -19,10 +19,10 @@ export default async function edit(req, res) {
         return res.redirect(`${req.adminizer.config.routePrefix}/${entity.uri}`);
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/editGroup.js

@@ -4,10 +4,10 @@ import { inertiaGroupHelper } from "../helpers/inertiaGroupHelper";
 export default async function editGroup(req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/editUser.js

@@ -5,10 +5,10 @@ import { inertiaUserHelper } from "../helpers/inertiaUserHelper";
 export default async function (req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/form.js

@@ -8,10 +8,10 @@ export default async function form(req, res) {
         return res.status(404).send({ error: 'Not Found' });
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${slug}-form`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`update-${slug}-form`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/getAllWidgets.js

@@ -1,15 +1,15 @@
 export default async function getAllWidgets(req, res) {
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`widgets`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`widgets`, req.user)) {
             return res.sendStatus(403);
         }
     }
     if (req.method.toUpperCase() === 'GET') {
         try {
-            return res.json({ widgets: await req.adminizer.widgetHandler.getAll(req.session.UserAP) });
+            return res.json({ widgets: await req.adminizer.widgetHandler.getAll(req.user) });
         }
         catch (e) {
             return res.status(500).send({ error: e.message || 'Internal Server Error' });

package/controllers/list.js

@@ -9,10 +9,10 @@ export default async function list(req, res) {
         return res.status(404).send({ error: 'Not Found' });
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/login.js

@@ -2,6 +2,8 @@ import { POWCaptcha } from "../lib/v4/POWCaptcha";
 import passwordHash from "password-hash";
 import { inertiaLoginHelper } from "../helpers/inertiaAutHelper";
 import { Adminizer } from "../lib/Adminizer";
+import { signUser } from "../lib/v4/helper/jwt";
+import { serialize } from "cookie";
 export default async function login(req, res) {
     const powCaptcha = new POWCaptcha();
     if (req.originalUrl.indexOf("login") >= 0) {
@@ -24,9 +26,8 @@ export default async function login(req, res) {
                 if (!user) {
                     return res.sendStatus(404);
                 }
-                if (req.session.UserAP.isAdministrator) {
-                    req.session.adminPretender = req.session.UserAP;
-                    req.session.UserAP = user;
+                if (req.user.isAdministrator) {
+                    req.session.userPretended = user;
                     // return res.sendStatus(200);
                     return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
                 }
@@ -45,13 +46,18 @@ export default async function login(req, res) {
                     //Here we use the captchaSolution key to output messages unrelated to the form fields.
                     return inertiaAdminMessage(req, "Profile is not confirmed, please contact to administrator", 'captchaSolution');
                 }
-                // TODO: Add salt
                 if (passwordHash.verify(login + password + process.env.AP_PASSWORD_SALT, user.passwordHashed)) {
                     if (user.expires && Date.now() > Date.parse(user.expires)) {
                         //Here we use the captchaSolution key to output messages unrelated to the form fields.
                         return inertiaAdminMessage(req, "Profile expired, contact the administrator", 'captchaSolution');
                     }
-                    req.session.UserAP = user;
+                    const token = signUser(user, req.adminizer.jwtSecret);
+                    res.setHeader('Set-Cookie', serialize('adminizer_jwt', token, {
+                        httpOnly: true,
+                        sameSite: 'lax',
+                        path: '/',
+                        maxAge: 60 * 60 * 24 * 7 * 2,
+                    }));
                     return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
                 }
                 else {
@@ -73,12 +79,11 @@ export default async function login(req, res) {
         }
     }
     else if (req.originalUrl.indexOf("logout") >= 0) {
-        if (req.session.adminPretender && req.session.adminPretender.id && req.session.UserAP && req.session.UserAP.id) {
-            req.session.UserAP = req.session.adminPretender;
-            req.session.adminPretender = {};
+        if (req.session.userPretended && req.session.userPretended.id && req.user && req.user.id) {
+            delete (req.session.userPretended);
             return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/`);
         }
-        req.session.UserAP = undefined;
+        req.user = undefined;
         req.Inertia.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
     }
     return res.status(404);

package/controllers/media-manager/mediaManagerApi.js

@@ -4,10 +4,10 @@ export async function mediaManagerController(req, res) {
     const method = req.method.toUpperCase();
     let id = req.params.id ? req.params.id : '';
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${id}`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${id}`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/navigation/edit.js

@@ -2,7 +2,7 @@ import { ControllerHelper } from "../../helpers/controllerHelper";
 import { DataAccessor } from "../../lib/v4/DataAccessor";
 export default async function edit(req, res) {
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
     }

package/controllers/processInstallFinalize.js

@@ -3,10 +3,10 @@ import { Adminizer } from "../lib/Adminizer";
 let installStepper = InstallStepper.getInstance();
 export default async function processInstallFinalize(req, res) {
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`process-install-step`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`process-install-step`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/processInstallStep.d.ts

@@ -1 +0,0 @@
-export default function processInstallStep(req: ReqType, res: ResType): Promise<void>;

package/controllers/processInstallStep.js

@@ -1,132 +1,122 @@
-import { InstallStepper } from "../lib/installStepper/installStepper";
-import * as path from "path";
-import { Adminizer } from "../lib/Adminizer";
-export default async function processInstallStep(req, res) {
-    if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
-            res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
-            return;
-        }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`process-install-step`, req.session.UserAP)) {
-            res.sendStatus(403);
-            return;
-        }
-    }
-    if (req.method.toUpperCase() === 'GET') {
-        Adminizer.log.debug("GET REQUEST TO PROCESS INSTALL STEP");
-        let installStepper = InstallStepper.getStepper(req.params.id);
-        if (!installStepper) {
-            res.redirect(`${req.adminizer.config.routePrefix}/`);
-            return;
-        }
-        if (installStepper.hasUnprocessedSteps() || installStepper.hasUnfinalizedSteps()) {
-            let renderData = installStepper.render(req);
-            let renderer = renderData.currentStep.renderer;
-            // run onInit method before showing step to user
-            try {
-                await renderData.currentStep.onInit();
-            }
-            catch (e) {
-                console.log("ERROR IN PROCESS INSTALL STEP", e);
-                res.viewAdmin(`installer/error`, { error: e, stepperId: installStepper.id });
-                return;
-            }
-            res.viewAdmin(`installer/${renderer}`, { ...renderData, stepperId: installStepper.id });
-            return;
-        }
-        else {
-            res.redirect(`${req.adminizer.config.routePrefix}/`);
-            return;
-        }
-    }
-    if (req.method.toUpperCase() === 'POST') {
-        try {
-            Adminizer.log.debug("POST REQUEST TO PROCESS INSTALL STEP", JSON.stringify(req.body, null, 2));
-            let installStepper = InstallStepper.getStepper(req.params.id);
-            const currentStepId = req.body.currentStepId;
-            const filesCounter = req.body.filesCounter;
-            // upload files before processing other fields (filesCounter > 0 means that req contains files)
-            const uploadedFiles = await handleFileUploads(req, currentStepId, filesCounter);
-            if (req.body.action === 'next') {
-                const inputData = JSON.parse(req.body.inputData);
-                if (uploadedFiles.length) {
-                    inputData.uploadedFiles = uploadedFiles;
-                }
-                // trying to process step
-                await installStepper.processStep(currentStepId, inputData);
-            }
-            else if (req.body.action === 'skip') {
-                // trying to skip step
-                await installStepper.skipStep(currentStepId);
-            }
-            else {
-                res.status(400).send("Invalid action parameter");
-                return;
-            }
-            // go back to stepper if there are more unprocessed steps, otherwise go back to /admin
-            if (installStepper.hasUnprocessedSteps()) {
-                res.redirect(`${req.adminizer.config.routePrefix}/install/${installStepper.id}`);
-                return;
-            }
-            else {
-                res.redirect(`${req.adminizer.config.routePrefix}/`);
-                return;
-            }
-        }
-        catch (error) {
-            Adminizer.log.error("Error processing step:", error);
-            res.status(500).send("Error processing step");
-            return;
-        }
-    }
-    if (req.method.toUpperCase() === 'DELETE') {
-        Adminizer.log.debug("DELETE REQUEST TO PROCESS INSTALL STEP", req.body);
-        try {
-            InstallStepper.deleteStepper(req.params.id);
-            res.status(200).send("OK");
-            return;
-        }
-        catch (e) {
-            res.status(403).send(e);
-            return;
-        }
-    }
-    res.status(500).send("Invalid request method");
-    return;
-}
-;
-async function handleFileUploads(req, currentStepId, filesCounter) {
-    const uploadedFiles = [];
-    for (let i = 0; i < filesCounter; i++) {
-        const fieldName = `files_${i}`;
-        const uploadMiddleware = req.upload({
-            destination: "installStepper/uploadedImages",
-            filename: (file) => {
-                const extension = path.extname(file.originalname);
-                const baseName = path.basename(file.originalname, extension);
-                return `${currentStepId}_${baseName}_${Date.now()}${extension}`;
-            },
-        }).single(fieldName);
-        try {
-            await new Promise((resolve, reject) => {
-                uploadMiddleware(req, null, (err) => {
-                    if (err) {
-                        Adminizer.logger.error(`Error uploading file: ${fieldName}`, err);
-                        reject(err);
-                    }
-                    else {
-                        const uploadedFile = req.file?.path;
-                        if (uploadedFile) {
-                            uploadedFiles.push(uploadedFile);
-                        }
-                        resolve();
-                    }
-                });
-            });
-        }
-        catch (err) {
-            Adminizer.logger.error(`Failed to upload file: ${fieldName}`, err);
-        }
-    }
-    return uploadedFiles;
-}
+"use strict";
+// import {InstallStepper} from "../lib/installStepper/installStepper";
+// import * as path from "path";
+// import {Adminizer} from "../lib/Adminizer";
+// export default async function processInstallStep(req: ReqType, res: ResType): Promise<void> {
+// 	if (req.adminizer.config.auth.enable) {
+// 		if (!req.user) {
+// 			res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
+// 			return
+// 		} else if (!req.adminizer.accessRightsHelper.hasPermission(`process-install-step`, req.user)) {
+// 			res.sendStatus(403);
+// 			return
+// 		}
+// 	}
+// 	if (req.method.toUpperCase() === 'GET') {
+// 		Adminizer.log.debug("GET REQUEST TO PROCESS INSTALL STEP")
+// 		let installStepper = InstallStepper.getStepper(req.params.id);
+// 		if (!installStepper) {
+// 			res.redirect(`${req.adminizer.config.routePrefix}/`);
+// 			return
+// 		}
+// 		if (installStepper.hasUnprocessedSteps() || installStepper.hasUnfinalizedSteps()) {
+// 			let renderData = installStepper.render(req);
+// 			let renderer = renderData.currentStep.renderer;
+// 			// run onInit method before showing step to user
+// 			try {
+// 				await renderData.currentStep.onInit();
+// 			} catch (e) {
+// 				console.log("ERROR IN PROCESS INSTALL STEP", e)
+// 				res.viewAdmin(`installer/error`, {error: e, stepperId: installStepper.id});
+// 				return
+// 			}
+// 			res.viewAdmin(`installer/${renderer}`, {...renderData, stepperId: installStepper.id});
+// 			return
+// 		} else {
+// 			res.redirect(`${req.adminizer.config.routePrefix}/`);
+// 			return
+// 		}
+// 	}
+// 	if (req.method.toUpperCase() === 'POST') {
+// 		try {
+// 			Adminizer.log.debug("POST REQUEST TO PROCESS INSTALL STEP", JSON.stringify(req.body, null, 2))
+// 			let installStepper = InstallStepper.getStepper(req.params.id);
+// 			const currentStepId = req.body.currentStepId;
+// 			const filesCounter = req.body.filesCounter;
+// 			// upload files before processing other fields (filesCounter > 0 means that req contains files)
+// 			const uploadedFiles = await handleFileUploads(req, currentStepId, filesCounter);
+// 			if (req.body.action === 'next') {
+// 				const inputData = JSON.parse(req.body.inputData);
+// 				if (uploadedFiles.length) {
+// 					inputData.uploadedFiles = uploadedFiles;
+// 				}
+// 				// trying to process step
+// 				await installStepper.processStep(currentStepId, inputData);
+// 			} else if (req.body.action === 'skip') {
+// 				// trying to skip step
+// 				await installStepper.skipStep(currentStepId);
+// 			} else {
+// 				res.status(400).send("Invalid action parameter");
+// 				return
+// 			}
+// 			// go back to stepper if there are more unprocessed steps, otherwise go back to /admin
+// 			if (installStepper.hasUnprocessedSteps()) {
+// 				res.redirect(`${req.adminizer.config.routePrefix}/install/${installStepper.id}`);
+// 				return
+// 			} else {
+// 				res.redirect(`${req.adminizer.config.routePrefix}/`);
+// 				return
+// 			}
+// 		} catch (error) {
+// 			Adminizer.log.error("Error processing step:", error);
+// 			res.status(500).send("Error processing step");
+// 			return
+// 		}
+// 	}
+// 	if (req.method.toUpperCase() === 'DELETE') {
+// 		Adminizer.log.debug("DELETE REQUEST TO PROCESS INSTALL STEP", req.body)
+// 		try {
+// 			InstallStepper.deleteStepper(req.params.id);
+// 			res.status(200).send("OK")
+// 			return
+// 		} catch (e) {
+// 			res.status(403).send(e);
+// 			return
+// 		}
+// 	}
+// 	res.status(500).send("Invalid request method")
+// 	return
+// };
+// async function handleFileUploads(req: ReqType, currentStepId: string | number, filesCounter: number): Promise<string[]> {
+// 	const uploadedFiles: string[] = [];
+// 	for (let i = 0; i < filesCounter; i++) {
+// 		const fieldName = `files_${i}`;
+// 		const uploadMiddleware = req.upload({
+// 			destination: "installStepper/uploadedImages",
+// 			filename: (file) => {
+// 				const extension = path.extname(file.originalname);
+// 				const baseName = path.basename(file.originalname, extension);
+// 				return `${currentStepId}_${baseName}_${Date.now()}${extension}`;
+// 			},
+// 		}).single(fieldName);
+// 		try {
+// 			await new Promise<void>((resolve, reject) => {
+// 				uploadMiddleware(req, null, (err) => {
+// 					if (err) {
+// 						Adminizer.logger.error(`Error uploading file: ${fieldName}`, err);
+// 						reject(err);
+// 					} else {
+// 						const uploadedFile = (req.file as Express.Multer.File)?.path;
+// 						if (uploadedFile) {
+// 							uploadedFiles.push(uploadedFile);
+// 						}
+// 						resolve();
+// 					}
+// 				});
+// 			});
+// 		} catch (err) {
+// 			Adminizer.logger.error(`Failed to upload file: ${fieldName}`, err);
+// 		}
+// 	}
+// 	return uploadedFiles;
+// }

package/controllers/remove.js

@@ -18,10 +18,10 @@ export default async function remove(req, res) {
         return res.redirect(`${req.adminizer.config.routePrefix}/${entity.uri}`);
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/timezones.js

@@ -1,6 +1,6 @@
 export default async function timezones(req, res) {
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
     }

package/controllers/view.js

@@ -18,10 +18,10 @@ export default async function view(req, res) {
         return res.status(404).send({ error: 'Not Found' });
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }

package/controllers/welcome.js

@@ -2,7 +2,7 @@
  * Welcome text
  */
 export default function welcome(req, res) {
-    if (req.adminizer.config.auth.enable && !req.session.UserAP) {
+    if (!req.user) {
         return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
     }
     let text = '';

package/controllers/widgets/Action.js

@@ -4,10 +4,10 @@ export async function widgetActionController(req, res) {
         return res.status(404).send({ error: 'Not Found' });
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`widget-${widgetId}`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`widget-${widgetId}`, req.user)) {
             return res.sendStatus(403);
         }
     }