adminforth 1.1.74 → 1.1.75

package/auth.ts

@@ -37,6 +37,20 @@ class AdminForthAuth {
     response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
   }
 
+  removeCustomCookie({response, name}) {
+    response.setHeader('Set-Cookie', `adminforth_test'='2'; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+  }
+
+  setCustomCookie({ response, payload }: {
+    response: any, payload: {name: string, value: string, expiry: number, httpOnly: boolean}
+  }) {
+    const {name,value,expiry,httpOnly} = payload
+    response.setHeader('Set-Cookie', `adminforth_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + expiry).toUTCString() } `);
+  }
+
+ 
+
+
   issueJWT(payload: Object, type: string) {
     // read ADMINFORH_SECRET from environment if not drop error
     const secret = process.env.ADMINFORTH_SECRET;

package/dataConnectors/postgres.ts

@@ -272,7 +272,7 @@ class PostgresConnector extends AdminForthBaseConnector implements AdminForthDat
         await this.db.query(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`, values);
     }
 
-    async updateRecord({ resource, recordId, newValues }) {
+    async updateRecord({ resource, recordId,  newValues }) {
         const values = [...Object.values(newValues), recordId];
         const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
         await this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`, values);

package/dist/auth.js

@@ -34,6 +34,13 @@ class AdminForthAuth {
         const token = this.issueJWT({ username, pk, }, 'auth');
         response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
     }
+    removeCustomCookie({ response, name }) {
+        response.setHeader('Set-Cookie', `adminforth_test'='2'; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+    }
+    setCustomCookie({ response, payload }) {
+        const { name, value, expiry, httpOnly } = payload;
+        response.setHeader('Set-Cookie', `adminforth_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + expiry).toUTCString()} `);
+    }
     issueJWT(payload, type) {
         // read ADMINFORH_SECRET from environment if not drop error
         const secret = process.env.ADMINFORTH_SECRET;

package/dist/index.js

@@ -23,7 +23,7 @@ import ExpressServer from './servers/express.js';
 import { v1 as uuid } from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION, listify } from './modules/utils.js';
-import { AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages, AllowedActionsEnum, ActionCheckSource, } from './types/AdminForthConfig.js';
+import { AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages, AllowedActionsEnum, ActionCheckSource } from './types/AdminForthConfig.js';
 import path from 'path';
 //get array from enum AdminForthResourcePages
 class AdminForth {
@@ -120,6 +120,24 @@ class AdminForth {
         if (!this.config.customization) {
             this.config.customization = {};
         }
+        if (!this.config.customization.customComponentsDir) {
+            this.config.customization.customComponentsDir = './custom';
+        }
+        try {
+            // check customComponentsDir exists
+            fs.accessSync(this.config.customization.customComponentsDir, fs.constants.R_OK);
+        }
+        catch (e) {
+            this.config.customization.customComponentsDir = undefined;
+        }
+        if (this.config.customization.customPages) {
+            this.config.customization.customPages.forEach((page, i) => {
+                // validate component if it's not plugin injection
+                if (this.codeInjector.allComponentNames.hasOwnProperty(page.component)) {
+                    const validatedPage = this.validateComponent(page.component, errors, true);
+                }
+            });
+        }
         if (!this.config.baseUrl) {
             this.config.baseUrl = '';
         }
@@ -287,34 +305,41 @@ class AdminForth {
                     });
                 }
                 // transform all hooks Functions to array of functions
-                if (res.hooks) {
-                    for (const value of [res.hooks.show, res.hooks.list]) {
-                        if (value) {
-                            if (value.beforeDatasourceRequest) {
-                                if (!Array.isArray(value.beforeDatasourceRequest)) {
-                                    value.beforeDatasourceRequest = [value.beforeDatasourceRequest];
-                                }
-                            }
-                            if (value.afterDatasourceResponse) {
-                                if (!Array.isArray(value.afterDatasourceResponse)) {
-                                    value.afterDatasourceResponse = [value.afterDatasourceResponse];
-                                }
-                            }
-                        }
+                if (!res.hooks) {
+                    res.hooks = {};
+                }
+                for (const hookName of ['show', 'list']) {
+                    if (!res.hooks[hookName]) {
+                        res.hooks[hookName] = {};
                     }
-                    for (const value of [res.hooks.create, res.hooks.edit, res.hooks.delete]) {
-                        if (value) {
-                            if (value.beforeSave) {
-                                if (!Array.isArray(value.beforeSave)) {
-                                    value.beforeSave = [value.beforeSave];
-                                }
-                            }
-                            if (value.afterSave) {
-                                if (!Array.isArray(value.afterSave)) {
-                                    value.afterSave = [value.afterSave];
-                                }
-                            }
-                        }
+                    if (!res.hooks[hookName].beforeDatasourceRequest) {
+                        res.hooks[hookName].beforeDatasourceRequest = [];
+                    }
+                    if (!Array.isArray(res.hooks[hookName].beforeDatasourceRequest)) {
+                        res.hooks[hookName].beforeDatasourceRequest = [res.hooks[hookName].beforeDatasourceRequest];
+                    }
+                    if (!res.hooks[hookName].afterDatasourceResponse) {
+                        res.hooks[hookName].afterDatasourceResponse = [];
+                    }
+                    if (!Array.isArray(res.hooks[hookName].afterDatasourceResponse)) {
+                        res.hooks[hookName].afterDatasourceResponse = [res.hooks[hookName].afterDatasourceResponse];
+                    }
+                }
+                for (const hookName of ['create', 'edit', 'delete']) {
+                    if (!res.hooks[hookName]) {
+                        res.hooks[hookName] = {};
+                    }
+                    if (!res.hooks[hookName].beforeSave) {
+                        res.hooks[hookName].beforeSave = [];
+                    }
+                    if (!Array.isArray(res.hooks[hookName].beforeSave)) {
+                        res.hooks[hookName].beforeSave = [res.hooks[hookName].beforeSave];
+                    }
+                    if (!res.hooks[hookName].afterSave) {
+                        res.hooks[hookName].afterSave = [];
+                    }
+                    if (!Array.isArray(res.hooks[hookName].afterSave)) {
+                        res.hooks[hookName].afterSave = [res.hooks[hookName].afterSave];
                     }
                 }
             });
@@ -397,6 +422,9 @@ class AdminForth {
             if (typeof column.required === 'boolean') {
                 column.required = { create: column.required, edit: column.required };
             }
+            if (!column.required) {
+                column.required = { create: false, edit: false };
+            }
             // same for editingNote
             if (typeof column.editingNote === 'string') {
                 column.editingNote = { create: column.editingNote, edit: column.editingNote };
@@ -520,6 +548,7 @@ class AdminForth {
             yield connector.createRecord({ resource, record });
             // execute hook if needed
             for (const hook of listify((_g = (_f = resource.hooks) === null || _f === void 0 ? void 0 : _f.create) === null || _g === void 0 ? void 0 : _g.afterSave)) {
+                console.log('Hook afterSave', hook);
                 const resp = yield hook({ resource, record, adminUser });
                 if (!resp || (!resp.ok && !resp.error)) {
                     throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -536,12 +565,15 @@ class AdminForth {
             method: 'POST',
             path: '/login',
             handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, response }) {
-                var _c;
+                var _c, _d, _e, _f, _g, _h;
                 const INVALID_MESSAGE = 'Invalid username or password';
                 const { username, password } = body;
+                let adminUser;
+                let toReturn = { ok: true, allowedLogin: true };
                 let token;
                 if (username === this.config.rootUser.username && password === this.config.rootUser.password) {
                     this.auth.setAuthCookie({ response, username, pk: null });
+                    adminUser = { isRoot: true, dbUser: null, pk: null, username: this.config.rootUser.username };
                 }
                 else {
                     // get resource from db
@@ -572,22 +604,43 @@ class AdminForth {
                         return { error: 'User not found' };
                     }
                     const passwordHash = userRecord[this.config.auth.passwordHashField];
-                    console.log('User record', userRecord, passwordHash); // why does it has no hash?
                     const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);
                     if (valid) {
-                        this.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
+                        adminUser = {
+                            isRoot: false, dbUser: userRecord,
+                            pk: userRecord[userResource.columns.find((col) => col.primaryKey).name],
+                            username
+                        };
+                        const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation;
+                        if (beforeLoginConfirmation.length) {
+                            for (const hook of beforeLoginConfirmation) {
+                                const resp = yield hook({ userRecord: adminUser });
+                                if ((_d = resp === null || resp === void 0 ? void 0 : resp.body) === null || _d === void 0 ? void 0 : _d.setCookie) {
+                                    (_e = resp === null || resp === void 0 ? void 0 : resp.body) === null || _e === void 0 ? void 0 : _e.setCookie.forEach((cookie) => {
+                                        this.auth.setCustomCookie({ response, payload: cookie });
+                                    });
+                                }
+                                if ((_f = resp === null || resp === void 0 ? void 0 : resp.body) === null || _f === void 0 ? void 0 : _f.redirectTo) {
+                                    toReturn = { ok: resp.ok, redirectTo: (_g = resp === null || resp === void 0 ? void 0 : resp.body) === null || _g === void 0 ? void 0 : _g.redirectTo, allowedLogin: (_h = resp === null || resp === void 0 ? void 0 : resp.body) === null || _h === void 0 ? void 0 : _h.allowedLogin };
+                                    break;
+                                }
+                            }
+                        }
+                        if (toReturn.allowedLogin) {
+                            this.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
+                        }
                     }
                     else {
                         return { error: INVALID_MESSAGE };
                     }
                 }
-                return { ok: true };
-            }),
+                return toReturn;
+            })
         });
         server.endpoint({
             method: 'POST',
             path: '/check_auth',
-            handler: (_d) => __awaiter(this, [_d], void 0, function* ({ adminUser }) {
+            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ adminUser }) {
                 return { ok: true };
             }),
         });
@@ -595,8 +648,8 @@ class AdminForth {
             noAuth: true,
             method: 'POST',
             path: '/logout',
-            handler: (_e) => __awaiter(this, [_e], void 0, function* ({ response }) {
-                this.auth.removeAuthCookie({ response });
+            handler: (_k) => __awaiter(this, [_k], void 0, function* ({ response }) {
+                this.auth.removeAuthCookie(response);
                 return { ok: true };
             }),
         });
@@ -604,8 +657,8 @@ class AdminForth {
             noAuth: true,
             method: 'GET',
             path: '/get_public_config',
-            handler: (_f) => __awaiter(this, [_f], void 0, function* ({ body }) {
-                var _g;
+            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body }) {
+                var _m;
                 // find resource
                 if (!this.config.auth) {
                     throw new Error('No config.auth defined');
@@ -617,15 +670,15 @@ class AdminForth {
                     brandName: this.config.customization.brandName,
                     usernameFieldName: usernameColumn.label,
                     loginBackgroundImage: this.config.auth.loginBackgroundImage,
-                    title: (_g = this.config.customization) === null || _g === void 0 ? void 0 : _g.title,
+                    title: (_m = this.config.customization) === null || _m === void 0 ? void 0 : _m.title,
                 };
             }),
         });
         server.endpoint({
             method: 'GET',
             path: '/get_base_config',
-            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ input, adminUser, cookies }) {
-                var _j, _k;
+            handler: (_o) => __awaiter(this, [_o], void 0, function* ({ input, adminUser, cookies }) {
+                var _p, _q;
                 let username = '';
                 let userFullName = '';
                 if (adminUser.isRoot) {
@@ -672,7 +725,6 @@ class AdminForth {
                     }
                     newMenu.push(newMenuItem);
                 }
-                console.log(userData, 'this is the user data');
                 return {
                     user: userData,
                     resources: this.config.resources.map((res) => ({
@@ -687,8 +739,8 @@ class AdminForth {
                         deleteConfirmation: this.config.deleteConfirmation,
                         auth: this.config.auth,
                         usernameField: this.config.auth.usernameField,
-                        title: (_j = this.config.customization) === null || _j === void 0 ? void 0 : _j.title,
-                        emptyFieldPlaceholder: (_k = this.config.customization) === null || _k === void 0 ? void 0 : _k.emptyFieldPlaceholder,
+                        title: (_p = this.config.customization) === null || _p === void 0 ? void 0 : _p.title,
+                        emptyFieldPlaceholder: (_q = this.config.customization) === null || _q === void 0 ? void 0 : _q.emptyFieldPlaceholder,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,
@@ -727,7 +779,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource',
-            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body, adminUser }) {
+            handler: (_r) => __awaiter(this, [_r], void 0, function* ({ body, adminUser }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -749,8 +801,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_m) => __awaiter(this, [_m], void 0, function* ({ body, adminUser }) {
-                var _o, _p, _q, _r;
+            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body, adminUser }) {
+                var _t, _u, _v, _w;
                 const { resourceId, source } = body;
                 if (['show', 'list'].includes(source) === false) {
                     return { error: 'Invalid source, should be list or show' };
@@ -770,7 +822,7 @@ class AdminForth {
                 if (!allowed) {
                     return { error };
                 }
-                for (const hook of listify((_p = (_o = resource.hooks) === null || _o === void 0 ? void 0 : _o[source]) === null || _p === void 0 ? void 0 : _p.beforeDatasourceRequest)) {
+                for (const hook of listify((_u = (_t = resource.hooks) === null || _t === void 0 ? void 0 : _t[source]) === null || _u === void 0 ? void 0 : _u.beforeDatasourceRequest)) {
                     const resp = yield hook({ resource, query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -837,7 +889,7 @@ class AdminForth {
                         item[col.name] = targetDataMap[item[col.name]];
                     });
                 })));
-                for (const hook of listify((_r = (_q = resource.hooks) === null || _q === void 0 ? void 0 : _q[source]) === null || _r === void 0 ? void 0 : _r.afterDatasourceResponse)) {
+                for (const hook of listify((_w = (_v = resource.hooks) === null || _v === void 0 ? void 0 : _v[source]) === null || _w === void 0 ? void 0 : _w.afterDatasourceResponse)) {
                     const resp = yield hook({ resource, response: data.data, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -863,8 +915,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_foreign_data',
-            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body, adminUser }) {
-                var _t, _u, _v, _w;
+            handler: (_x) => __awaiter(this, [_x], void 0, function* ({ body, adminUser }) {
+                var _y, _z, _0, _1;
                 const { resourceId, column } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -885,7 +937,7 @@ class AdminForth {
                 }
                 const targetResourceId = columnConfig.foreignResource.resourceId;
                 const targetResource = this.config.resources.find((res) => res.resourceId == targetResourceId);
-                for (const hook of listify((_u = (_t = columnConfig.foreignResource.hooks) === null || _t === void 0 ? void 0 : _t.dropdownList) === null || _u === void 0 ? void 0 : _u.beforeDatasourceRequest)) {
+                for (const hook of listify((_z = (_y = columnConfig.foreignResource.hooks) === null || _y === void 0 ? void 0 : _y.dropdownList) === null || _z === void 0 ? void 0 : _z.beforeDatasourceRequest)) {
                     const resp = yield hook({ query: body, adminUser, resource: targetResource });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -914,7 +966,7 @@ class AdminForth {
                 const response = {
                     items
                 };
-                for (const hook of listify((_w = (_v = columnConfig.foreignResource.hooks) === null || _v === void 0 ? void 0 : _v.dropdownList) === null || _w === void 0 ? void 0 : _w.afterDatasourceResponse)) {
+                for (const hook of listify((_1 = (_0 = columnConfig.foreignResource.hooks) === null || _0 === void 0 ? void 0 : _0.dropdownList) === null || _1 === void 0 ? void 0 : _1.afterDatasourceResponse)) {
                     const resp = yield hook({ response, adminUser, resource: targetResource });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -929,7 +981,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_x) => __awaiter(this, [_x], void 0, function* ({ body }) {
+            handler: (_2) => __awaiter(this, [_2], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -958,7 +1010,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_y) => __awaiter(this, [_y], void 0, function* ({ body, adminUser }) {
+            handler: (_3) => __awaiter(this, [_3], void 0, function* ({ body, adminUser }) {
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -985,8 +1037,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_z) => __awaiter(this, [_z], void 0, function* ({ body, adminUser }) {
-                var _0, _1, _2, _3;
+            handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
+                var _5, _6, _7, _8;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -1005,7 +1057,7 @@ class AdminForth {
                     return { error };
                 }
                 // execute hook if needed
-                for (const hook of listify((_1 = (_0 = resource.hooks) === null || _0 === void 0 ? void 0 : _0.edit) === null || _1 === void 0 ? void 0 : _1.beforeSave)) {
+                for (const hook of listify((_6 = (_5 = resource.hooks) === null || _5 === void 0 ? void 0 : _5.edit) === null || _6 === void 0 ? void 0 : _6.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
@@ -1029,10 +1081,10 @@ class AdminForth {
                     }
                 }
                 if (Object.keys(newValues).length > 0) {
-                    yield connector.updateRecord({ resource, recordId, record, newValues });
+                    yield connector.updateRecord({ resource, recordId, newValues });
                 }
                 // execute hook if needed
-                for (const hook of listify((_3 = (_2 = resource.hooks) === null || _2 === void 0 ? void 0 : _2.edit) === null || _3 === void 0 ? void 0 : _3.afterSave)) {
+                for (const hook of listify((_8 = (_7 = resource.hooks) === null || _7 === void 0 ? void 0 : _7.edit) === null || _8 === void 0 ? void 0 : _8.afterSave)) {
                     const resp = yield hook({ resource, record, adminUser, oldRecord });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -1049,8 +1101,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
-                var _5, _6, _7, _8;
+            handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body, adminUser }) {
+                var _10, _11, _12, _13;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
                 if (!resource) {
@@ -1068,7 +1120,7 @@ class AdminForth {
                     return { error };
                 }
                 // execute hook if needed
-                for (const hook of listify((_6 = (_5 = resource.hooks) === null || _5 === void 0 ? void 0 : _5.delete) === null || _6 === void 0 ? void 0 : _6.beforeSave)) {
+                for (const hook of listify((_11 = (_10 = resource.hooks) === null || _10 === void 0 ? void 0 : _10.delete) === null || _11 === void 0 ? void 0 : _11.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
@@ -1080,7 +1132,7 @@ class AdminForth {
                 const connector = this.connectors[resource.dataSource];
                 yield connector.deleteRecord({ resource, recordId: body['primaryKey'] });
                 // execute hook if needed
-                for (const hook of listify((_8 = (_7 = resource.hooks) === null || _7 === void 0 ? void 0 : _7.delete) === null || _8 === void 0 ? void 0 : _8.afterSave)) {
+                for (const hook of listify((_13 = (_12 = resource.hooks) === null || _12 === void 0 ? void 0 : _12.delete) === null || _13 === void 0 ? void 0 : _13.afterSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -1097,7 +1149,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body }) {
+            handler: (_14) => __awaiter(this, [_14], void 0, function* ({ body }) {
                 const { resourceId, actionId, recordIds } = body;
                 const resource = this.config.resources.find((res) => res.resourceId == resourceId);
                 if (!resource) {

package/dist/modules/codeInjector.js

@@ -107,11 +107,11 @@ class CodeInjector {
                         if (Object.keys(item).includes('isStaticRoute')) {
                             if (!item.isStaticRoute) {
                                 routes += `{
-              path: '${item.path}',
-              name: '${item.path}',
-              component: () => import('${item.component}'),
-              meta: { title: '${((_a = item === null || item === void 0 ? void 0 : item.meta) === null || _a === void 0 ? void 0 : _a.title) || item.path.replace('/', '')}'}
-            },\n`;
+                path: '${item.path}',
+                name: '${item.path}',
+                component: () => import('${item.component}'),
+                meta: { title: '${((_a = item === null || item === void 0 ? void 0 : item.meta) === null || _a === void 0 ? void 0 : _a.title) || item.path.replace('/', '')}'}
+              },\n`;
                             }
                             else {
                                 routes += `{
@@ -127,21 +127,21 @@ class CodeInjector {
                         else {
                             if (item.homepage) {
                                 routes += `{
-                path: '${item.path}',
-                name: '${item.path}',
-                component: ${getComponentNameFromPath(item.component)},
-                meta: { title: '${((_c = item === null || item === void 0 ? void 0 : item.meta) === null || _c === void 0 ? void 0 : _c.title) || item.path.replace('/', '')}'}
-              },\n`;
+                  path: '${item.path}',
+                  name: '${item.path}',
+                  component: ${getComponentNameFromPath(item.component)},
+                  meta: { title: '${((_c = item === null || item === void 0 ? void 0 : item.meta) === null || _c === void 0 ? void 0 : _c.title) || item.path.replace('/', '')}'}
+                },\n`;
                                 const componentName = `${getComponentNameFromPath(item.component)}`;
                                 routerComponents += `import ${componentName} from '${item.component}';\n`;
                             }
                             else {
                                 routes += `{
-                path: '${item.path}',
-                name: '${item.path}',
-                component: () => import('${item.component}'),
-                meta: { title: '${((_d = item === null || item === void 0 ? void 0 : item.meta) === null || _d === void 0 ? void 0 : _d.title) || item.path.replace('/', '')}'}
-              },\n`;
+                  path: '${item.path}',
+                  name: '${item.path}',
+                  component: () => import('${item.component}'),
+                  meta: { title: '${((_d = item === null || item === void 0 ? void 0 : item.meta) === null || _d === void 0 ? void 0 : _d.title) || item.path.replace('/', '')}'}
+                },\n`;
                             }
                         }
                     }
@@ -150,6 +150,20 @@ class CodeInjector {
                     }
                 });
             };
+            const registerCustomPages = (config) => {
+                if (config.customization.customPages) {
+                    config.customization.customPages.forEach((page) => {
+                        var _a, _b, _c, _d;
+                        routes += `{
+            path: '${page.path}',
+            name: '${page.path}',
+            component: () => import('${((_a = page === null || page === void 0 ? void 0 : page.component) === null || _a === void 0 ? void 0 : _a.file) || page.component}'),
+            meta: { title: '${((_b = page.meta) === null || _b === void 0 ? void 0 : _b.title) || page.path.replace('/', '')}',customLayout:${(_d = (_c = page === null || page === void 0 ? void 0 : page.component) === null || _c === void 0 ? void 0 : _c.meta) === null || _d === void 0 ? void 0 : _d.customLayout}}
+          },`;
+                    });
+                }
+            };
+            registerCustomPages(this.adminforth.config);
             collectAssetsFromMenu(this.adminforth.config.menu);
             if (filesUpdated) {
                 // copy only updated files

package/dist/plugins/AuditLogPlugin/index.js

@@ -93,23 +93,8 @@ class AuditLogPlugin extends AdminForthPlugin {
                 };
                 return;
             }
-            const defaultHooks = {
-                create: { afterSave: [] },
-                edit: { afterSave: [] },
-                delete: { beforeSave: [] }
-            };
-            if (!resource.hooks) {
-                resource.hooks = defaultHooks;
-            }
-            else {
-                resource.hooks = Object.assign(Object.assign({}, defaultHooks), resource.hooks);
-            }
-            Object.keys(resource.hooks).forEach((hook) => {
-                const hookToUse = hook == AllowedActionsEnum.delete ? 'beforeSave' : 'afterSave';
-                if (!Array.isArray(resource.hooks[hook][hookToUse])) {
-                    resource.hooks[hook][hookToUse] = [resource.hooks[hook][hookToUse]];
-                }
-                resource.hooks[hook][hookToUse].push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
+            ['edit', 'create', 'delete'].forEach((hook) => {
+                resource.hooks[hook].afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
                     return yield this.createLogRecord(resource, hook, record, adminUser, oldRecord);
                 }));
             });