Merge branch 'react' into demo

Author: markusweblance

fixture/adminizerConfig.ts

@@ -368,6 +368,10 @@ const config: AdminpanelConfig = {
     //     defaultUserGroup: "test",
     //     confirmationRequired: false
     // },
+    auth: {
+        enable: true,
+        description: "Login `demo`, password `demo`"
+    },
     dashboard: false,
     forms: {
         data: {
@@ -511,10 +515,6 @@ const config: AdminpanelConfig = {
         //config: string | object // db-migrate config
     },
     showVersion: true,
-    auth: {
-      enable: true,
-      description: "Login `demo`, password `demo`"
-    },
 };
 
 export default config

fixture/index.ts

@@ -180,7 +180,7 @@ async function ormSharedFixtureLift(adminizer: Adminizer) {
     })
 
     try {
-        adminpanelConfig.auth.enable = !!process.env.SEED_DATA
+        // adminpanelConfig.auth.enable = !!process.env.SEED_DATA
         await adminizer.init(adminpanelConfig as unknown as AdminpanelConfig)
 
     } catch (e) {

src/assets/js/components/add-user-form.tsx

@@ -22,6 +22,7 @@ import {
     TooltipTrigger,
 } from "@/components/ui/tooltip"
 import InputError from "@/components/input-error.tsx";
+import MaterialIcon from "@/components/material-icon.tsx";
 
 type value = string | boolean | Date | Record<string, string>[]
 
@@ -47,6 +48,10 @@ interface AddUserProps extends SharedData {
     postLink: string,
     head: string,
     groupHead: string,
+    userPretend: {
+        label: string,
+        postLink: string,
+    }
     fields: Field[]
     groups: Field[]
     locales: Record<string, string>[]
@@ -56,8 +61,7 @@ export default function AddUserForm() {
     const page = usePage<AddUserProps>()
     const [timezones, setTimezones] = useState<Record<string, string>[]>()
 
-    const {fields, groups} = page.props;
-
+    const {fields, groups, auth} = page.props;
     const {
         data,
         setData,
@@ -243,6 +247,14 @@ export default function AddUserForm() {
                             )}
                         </div>
                     </div>
+                    {auth.user.isAdministrator && (
+                        <Button className="w-fit" asChild variant="outline">
+                            <Link href={page.props.userPretend.postLink} method="post" data={{ login: data.login, pretend: true }}>
+                                <MaterialIcon name="masks" className="!text-[18px]"/>
+                                {page.props.userPretend.label}
+                            </Link>
+                        </Button>
+                    )}
                     <div className="flex gap-3">
                         <label className="font-bold text-xl">{getField('userPassword')?.label}</label>
                         <TooltipProvider>

src/assets/js/types/index.d.ts

@@ -46,6 +46,7 @@ export interface User {
     login: string;
     email: string;
     avatar?: string;
+    isAdministrator: boolean;
     [key: string]: unknown;
 }
 

src/controllers/edit.ts

@@ -168,7 +168,7 @@ export default async function edit(req: ReqType, res: ResType) {
         let fieldConfigConfig = fields[field].config as BaseFieldConfig;
         if (fieldConfigConfig.type === 'mediamanager') {
             if (fields[field].model.type === 'association-many') {
-                console.log(fieldConfigConfig.options);
+                // console.log(fieldConfigConfig.options);
                 record[field] = await getRelationsMediaManager({
                     list: record[field],
                     mediaManagerId: (fieldConfigConfig.options as MediaManagerOptionsField).id ?? "default"

src/controllers/login.ts

@@ -14,30 +14,34 @@ export default async function login(req: ReqType, res: ResType) {
             let password = req.body.password;
             let captchaSolution = req.body.captchaSolution;
 
-            // Verify CAPTCHA solution
-            const isCaptchaValid = powCaptcha.check(captchaSolution, `login:${req.ip}`);
-            if (!isCaptchaValid) {
-                return inertiaAdminMessage(req, "Invalid CAPTCHA solution", 'captchaSolution');
-            }
-
             let user: ModelsAP["UserAP"];
             try {
                 // TODO refactor CRUD functions for DataAccessor usage
                 user = await req.adminizer.modelHandler.model.get("UserAP")["_findOne"]({login: login});
             } catch (e) {
                 return res.status(500).send({error: e.message || 'Internal Server Error'});
             }
+
             if (req.body.pretend) {
                 if (!user) {
                     return res.sendStatus(404);
                 }
                 if (req.session.UserAP.isAdministrator) {
                     req.session.adminPretender = req.session.UserAP;
                     req.session.UserAP = user;
-                    return res.sendStatus(200);
+                    // return res.sendStatus(200);
+                    return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
                 }
+                return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/`);
             }
 
+            // Verify CAPTCHA solution
+            const isCaptchaValid = powCaptcha.check(captchaSolution, `login:${req.ip}`);
+            if (!isCaptchaValid) {
+                return inertiaAdminMessage(req, "Invalid CAPTCHA solution", 'captchaSolution');
+            }
+
+
             if (!user) {
                 return inertiaAdminMessage(req, "Wrong username", 'login');
             } else {

src/controllers/register.ts

@@ -56,7 +56,7 @@ export default async function register(req: ReqType, res: ResType) {
                 });
                 // TODO refactor CRUD functions for DataAccessor usage
                 let defaultUserGroup: ModelsAP["GroupAP"] = await req.adminizer.modelHandler.model.get("GroupAP")["_findOne"]({name: req.adminizer.config.registration.defaultUserGroup});
-                console.log(userap)
+                // console.log(userap)
                 // TODO refactor CRUD functions for DataAccessor usage
                 await req.adminizer.modelHandler.model.get("UserAP")["_updateOne"]({id: userap.id}, {
                     groups: [defaultUserGroup.id]

src/helpers/inertiaUserHelper.ts

@@ -1,6 +1,6 @@
 import {Entity, PropsField} from "../interfaces/types";
 
-interface listProps extends Record<string | number | symbol, unknown>{
+interface listProps extends Record<string | number | symbol, unknown> {
     edit: boolean;
     view: boolean;
     btnBack: {
@@ -17,6 +17,10 @@ interface listProps extends Record<string | number | symbol, unknown>{
     fields: PropsField[]
     groups: PropsField[]
     locales: Record<string, string>[],
+    userPretend: {
+        label: string,
+        postLink: string,
+    }
 }
 
 export function inertiaUserHelper(entity: Entity, req: ReqType, groups: ModelsAP["GroupAP"][], user?: ModelsAP["UserAP"], view: boolean = false) {
@@ -27,6 +31,10 @@ export function inertiaUserHelper(entity: Entity, req: ReqType, groups: ModelsAP
             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')

src/lib/datatable/NodeTable.ts

@@ -193,7 +193,7 @@ export class NodeTable {
             const totalRecords = await this.model.count({});
             const filteredRecords = await this.model.count(queryOptions.where);
             const data = await this.model.find(queryOptions, dataAccessor);
-            console.log(data, "data")
+            // console.log(data, "data")
             const output = {
                 draw: this.request.draw !== "" ? this.request.draw : 0,
                 recordsTotal: totalRecords,
@@ -254,7 +254,7 @@ export class NodeTable {
             });
             out.push(row);
         });
-        console.log(out)
+        // console.log(out)
         return out;
     }
 }

src/lib/v4/model/AbstractModel.ts

@@ -65,14 +65,14 @@ export abstract class AbstractModel<T> {
   public async findOne(criteria: Partial<T>, dataAccessor: DataAccessor): Promise<Partial<T> | null> {
     criteria = await dataAccessor.sanitizeUserRelationAccess(criteria);
     let record = await this._findOne(criteria);
-    console.log(record, "record")
+    // console.log(record, "record")
     return record ? dataAccessor.process(record) : null;
   }
 
   public async find(criteria: Partial<T>, dataAccessor: DataAccessor): Promise<Partial<T>[]> {
     criteria = await dataAccessor.sanitizeUserRelationAccess(criteria);
     let records = await this._find(criteria);
-    console.log(records, "records")
+    // console.log(records, "records")
 
     return records.map(record => dataAccessor.process(record));
   }