adminizer 4.1.0-build.11 → 4.1.0-build.13

package/system/bindInertia.js

@@ -102,18 +102,18 @@ export function bindInertia(adminizer) {
     adminizer.app.use((req, _, next) => {
         checkAuth(req, adminizer);
         req.Inertia.setViewData({
-            lang: req.session.UserAP?.locale || 'en',
+            lang: req.user?.locale || 'en',
         });
         const menuHelper = new InertiaMenuHelper(adminizer);
         req.Inertia.shareProps({
             auth: {
-                user: req.session.UserAP
+                user: req.session.userPretended ?? req.user
             },
-            menu: req.session.UserAP ? menuHelper.getMenuItems(req) : null,
+            menu: req.user ? menuHelper.getMenuItems(req) : null,
             brand: menuHelper.getBrandTitle(),
             logout: menuHelper.getLogoutUrl(),
-            logoutBtn: req.session.UserAP?.locale == 'ru' ? 'Выход' : "Log out",
-            section: req.session.UserAP ? [
+            logoutBtn: req.user?.locale == 'ru' ? 'Выход' : "Log out",
+            section: req.user ? [
                 {
                     title: req.i18n.__("Adminpanel"),
                     id: "adminpanel-0",
@@ -133,11 +133,11 @@ function checkAuth(req, adminizer) {
         locale = adminizer.config.translation.defaultLocale;
     }
     if (!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,
                 isAdministrator: true,
                 locale: locale,

package/system/bindInstallStepper.js

@@ -3,7 +3,7 @@ import { Adminizer } from "../lib/Adminizer";
 let installStepper = InstallStepper.getInstance();
 export default function bindInstallStepper(adminizer) {
     let installStepperPolicy = function (req, res, proceed) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return proceed();
         }
         let goingToProcessInstallStep = req._parsedUrl.pathname === `/install/${installStepper.id}`;

package/system/bindReqFunctions.js

@@ -1,6 +1,8 @@
 import { Adminizer } from "../lib/Adminizer";
 import multer from "multer";
 import { I18n } from "../lib/v4/I18n";
+import { parse } from "cookie";
+import { verifyUser } from "../lib/v4/helper/jwt";
 export default function bindReqFunctions(adminizer) {
     let bindReqFunctions = function (req, res, next) {
         /**
@@ -31,6 +33,20 @@ export default function bindReqFunctions(adminizer) {
         if (res.locals) {
             req.i18n.registerMethods(res.locals, req);
         }
+        // TODO: I made it quickly, you need to spread for architecture to different files, or re -ize this file to a girlfriend
+        // NOTE: This is here because inertia should receive data to routes
+        // JWT token
+        const cookies = parse(req.headers.cookie || '');
+        const token = cookies.adminizer_jwt;
+        if (token) {
+            const user = verifyUser(token, req.adminizer.jwtSecret);
+            if (user) {
+                req.user = user;
+            }
+        }
+        if (req.session.userPretended) {
+            req.user = req.session.userPretended;
+        }
         next();
     };
     adminizer.app.use('/', bindReqFunctions);