adminforth 1.1.103 → 1.1.105

package/dist/index.js

@@ -573,7 +573,7 @@ class AdminForth {
             method: 'POST',
             path: '/login',
             handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, response }) {
-                var _c, _d, _e, _f, _g, _h;
+                var _c, _d, _e, _f;
                 const INVALID_MESSAGE = 'Invalid username or password';
                 const { username, password } = body;
                 let adminUser;
@@ -622,14 +622,9 @@ class AdminForth {
                         const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation;
                         if (beforeLoginConfirmation === null || beforeLoginConfirmation === void 0 ? void 0 : beforeLoginConfirmation.length) {
                             for (const hook of beforeLoginConfirmation) {
-                                const resp = yield hook({ 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 };
+                                const resp = yield hook({ adminUser, response });
+                                if ((_d = resp === null || resp === void 0 ? void 0 : resp.body) === null || _d === void 0 ? void 0 : _d.redirectTo) {
+                                    toReturn = { ok: resp.ok, redirectTo: (_e = resp === null || resp === void 0 ? void 0 : resp.body) === null || _e === void 0 ? void 0 : _e.redirectTo, allowedLogin: (_f = resp === null || resp === void 0 ? void 0 : resp.body) === null || _f === void 0 ? void 0 : _f.allowedLogin };
                                     break;
                                 }
                             }
@@ -648,7 +643,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/check_auth',
-            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ adminUser }) {
+            handler: (_g) => __awaiter(this, [_g], void 0, function* ({ adminUser }) {
                 return { ok: true };
             }),
         });
@@ -656,7 +651,7 @@ class AdminForth {
             noAuth: true,
             method: 'POST',
             path: '/logout',
-            handler: (_k) => __awaiter(this, [_k], void 0, function* ({ response }) {
+            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ response }) {
                 this.auth.removeAuthCookie(response);
                 return { ok: true };
             }),
@@ -665,8 +660,8 @@ class AdminForth {
             noAuth: true,
             method: 'GET',
             path: '/get_public_config',
-            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body }) {
-                var _m;
+            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ body }) {
+                var _k;
                 // find resource
                 if (!this.config.auth) {
                     throw new Error('No config.auth defined');
@@ -678,15 +673,15 @@ class AdminForth {
                     brandName: this.config.customization.brandName,
                     usernameFieldName: usernameColumn.label,
                     loginBackgroundImage: this.config.auth.loginBackgroundImage,
-                    title: (_m = this.config.customization) === null || _m === void 0 ? void 0 : _m.title,
+                    title: (_k = this.config.customization) === null || _k === void 0 ? void 0 : _k.title,
                 };
             }),
         });
         server.endpoint({
             method: 'GET',
             path: '/get_base_config',
-            handler: (_o) => __awaiter(this, [_o], void 0, function* ({ input, adminUser, cookies }) {
-                var _p, _q;
+            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ input, adminUser, cookies }) {
+                var _m, _o;
                 let username = '';
                 let userFullName = '';
                 if (adminUser.isRoot) {
@@ -747,8 +742,8 @@ class AdminForth {
                         deleteConfirmation: this.config.deleteConfirmation,
                         auth: this.config.auth,
                         usernameField: this.config.auth.usernameField,
-                        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,
+                        title: (_m = this.config.customization) === null || _m === void 0 ? void 0 : _m.title,
+                        emptyFieldPlaceholder: (_o = this.config.customization) === null || _o === void 0 ? void 0 : _o.emptyFieldPlaceholder,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,
@@ -787,7 +782,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource',
-            handler: (_r) => __awaiter(this, [_r], void 0, function* ({ body, adminUser }) {
+            handler: (_p) => __awaiter(this, [_p], void 0, function* ({ body, adminUser }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -809,8 +804,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body, adminUser }) {
-                var _t, _u, _v, _w;
+            handler: (_q) => __awaiter(this, [_q], void 0, function* ({ body, adminUser }) {
+                var _r, _s, _t, _u;
                 const { resourceId, source } = body;
                 if (['show', 'list'].includes(source) === false) {
                     return { error: 'Invalid source, should be list or show' };
@@ -830,7 +825,7 @@ class AdminForth {
                 if (!allowed) {
                     return { error };
                 }
-                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)) {
+                for (const hook of listify((_s = (_r = resource.hooks) === null || _r === void 0 ? void 0 : _r[source]) === null || _s === void 0 ? void 0 : _s.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' } `);
@@ -897,7 +892,7 @@ class AdminForth {
                         item[col.name] = targetDataMap[item[col.name]];
                     });
                 })));
-                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)) {
+                for (const hook of listify((_u = (_t = resource.hooks) === null || _t === void 0 ? void 0 : _t[source]) === null || _u === void 0 ? void 0 : _u.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' } `);
@@ -923,8 +918,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_foreign_data',
-            handler: (_x) => __awaiter(this, [_x], void 0, function* ({ body, adminUser }) {
-                var _y, _z, _0, _1;
+            handler: (_v) => __awaiter(this, [_v], void 0, function* ({ body, adminUser }) {
+                var _w, _x, _y, _z;
                 const { resourceId, column } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -945,7 +940,7 @@ class AdminForth {
                 }
                 const targetResourceId = columnConfig.foreignResource.resourceId;
                 const targetResource = this.config.resources.find((res) => res.resourceId == targetResourceId);
-                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)) {
+                for (const hook of listify((_x = (_w = columnConfig.foreignResource.hooks) === null || _w === void 0 ? void 0 : _w.dropdownList) === null || _x === void 0 ? void 0 : _x.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' } `);
@@ -974,7 +969,7 @@ class AdminForth {
                 const response = {
                     items
                 };
-                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)) {
+                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.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' } `);
@@ -989,7 +984,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_2) => __awaiter(this, [_2], void 0, function* ({ body }) {
+            handler: (_0) => __awaiter(this, [_0], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -1018,7 +1013,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_3) => __awaiter(this, [_3], void 0, function* ({ body, adminUser }) {
+            handler: (_1) => __awaiter(this, [_1], 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` };
@@ -1039,8 +1034,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
-                var _5, _6, _7, _8;
+            handler: (_2) => __awaiter(this, [_2], void 0, function* ({ body, adminUser }) {
+                var _3, _4, _5, _6;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -1059,7 +1054,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.edit) === null || _6 === void 0 ? void 0 : _6.beforeSave)) {
+                for (const hook of listify((_4 = (_3 = resource.hooks) === null || _3 === void 0 ? void 0 : _3.edit) === null || _4 === void 0 ? void 0 : _4.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' } `);
@@ -1086,7 +1081,7 @@ class AdminForth {
                     yield connector.updateRecord({ resource, recordId, newValues });
                 }
                 // execute hook if needed
-                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)) {
+                for (const hook of listify((_6 = (_5 = resource.hooks) === null || _5 === void 0 ? void 0 : _5.edit) === null || _6 === void 0 ? void 0 : _6.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' } `);
@@ -1103,8 +1098,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body, adminUser }) {
-                var _10, _11, _12, _13;
+            handler: (_7) => __awaiter(this, [_7], void 0, function* ({ body, adminUser }) {
+                var _8, _9, _10, _11;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
                 if (!resource) {
@@ -1122,7 +1117,7 @@ class AdminForth {
                     return { error };
                 }
                 // execute hook if needed
-                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)) {
+                for (const hook of listify((_9 = (_8 = resource.hooks) === null || _8 === void 0 ? void 0 : _8.delete) === null || _9 === void 0 ? void 0 : _9.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' } `);
@@ -1134,7 +1129,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((_13 = (_12 = resource.hooks) === null || _12 === void 0 ? void 0 : _12.delete) === null || _13 === void 0 ? void 0 : _13.afterSave)) {
+                for (const hook of listify((_11 = (_10 = resource.hooks) === null || _10 === void 0 ? void 0 : _10.delete) === null || _11 === void 0 ? void 0 : _11.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' } `);
@@ -1151,7 +1146,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_14) => __awaiter(this, [_14], void 0, function* ({ body }) {
+            handler: (_12) => __awaiter(this, [_12], 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

@@ -91,7 +91,7 @@ class CodeInjector {
     }
     prepareSources(_a) {
         return __awaiter(this, arguments, void 0, function* ({ filesUpdated, verbose = false }) {
-            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             // check SPA_TMP_PATH exists and create if not
             try {
                 yield fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
@@ -245,7 +245,7 @@ class CodeInjector {
             // icons are collectionName:iconName. Get list of all unique collection names:
             const collections = new Set(icons.map((icon) => icon.split(':')[0]));
             // package names @iconify-prerendered/vue-<collection name>
-            const packageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
+            const iconPackageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
             // for each icon generate import statement
             const iconImports = uniqueIcons.map((icon) => {
                 const [collection, iconName] = icon.split(':');
@@ -358,47 +358,67 @@ class CodeInjector {
             const spaPackageLock = JSON.parse(yield fs.promises.readFile(spaPackageLockPath, 'utf-8'));
             const spaLockHash = hashify(spaPackageLock);
             /* customPackageLock */
-            const usersPackagePath = path.join('./package.json');
-            const usersPackage = JSON.parse(yield fs.promises.readFile(usersPackagePath, 'utf-8'));
-            const usersLockPath = path.join('./package-lock.json');
-            const usersLock = JSON.parse(yield fs.promises.readFile(usersLockPath, 'utf-8'));
-            const usersLockHash = hashify(usersLock);
-            const packagesNamesHash = hashify(packageNames);
-            const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
-            const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
-            try {
-                const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
-                if (existingHash === fullHash) {
-                    console.log('Hashes match, skipping npm ci/install');
-                    return;
+            let usersLockHash = '';
+            let usersLock = null;
+            if ((_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.customComponentsDir) {
+                const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
+                let usersPackage = null;
+                try {
+                    usersPackage = JSON.parse(yield fs.promises.readFile(usersPackagePath, 'utf-8'));
                 }
-                else {
+                catch (e) {
+                    // user package.json does not exist, user does not have custom components
+                }
+                if (usersPackage) {
+                    const usersLockPath = path.join(this.adminforth.config.customization.customComponentsDir, 'package-lock.json');
+                    try {
+                        usersLock = JSON.parse(yield fs.promises.readFile(usersLockPath, 'utf-8'));
+                    }
+                    catch (e) {
+                        throw new Error(`Custom package-lock.json does not exist in ${this.adminforth.config.customization.customComponentsDir}, but package.json does. 
+            We can't determine version of packages without package-lock.json. Please run npm install in ${this.adminforth.config.customization.customComponentsDir}`);
+                    }
+                    usersLockHash = hashify(usersLock);
+                }
+                const iconPackagesNamesHash = hashify(iconPackageNames);
+                const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
+                const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
+                try {
+                    const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
+                    if (existingHash === fullHash) {
+                        console.log('Hashes match, skipping npm ci/install');
+                        return;
+                    }
+                    else {
+                        if (verbose) {
+                            console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
+                        }
+                    }
+                }
+                catch (e) {
+                    // ignore
                     if (verbose) {
-                        console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
+                        console.log('Hash file does not exist, proceeding with npm ci/install');
                     }
                 }
-            }
-            catch (e) {
-                // ignore
-                if (verbose) {
-                    console.log('Hash file does not exist, proceeding with npm ci/install');
+                yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
+                let customPackgeNames = [];
+                if (usersPackage && usersLock) {
+                    customPackgeNames = [
+                        ...Object.keys(usersPackage.dependencies),
+                        ...Object.keys(usersPackage.devDependencies || [])
+                    ].reduce((acc, packageName) => {
+                        const version = usersLock.packages[`node_modules/${packageName}`].version;
+                        acc.push(`${packageName}@${version}`);
+                        return acc;
+                    }, []);
                 }
+                if (iconPackageNames.length) {
+                    const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
+                    yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
+                }
+                yield fs.promises.writeFile(hashPath, fullHash);
             }
-            yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
-            // get packages with version from customPackage
-            const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon', 'adminforth'];
-            const customPackgeNames = [...Object.keys(usersPackage.dependencies), ...Object.keys(usersPackage.devDependencies || [])]
-                .filter((packageName) => !IGNORE_PACKAGES.includes(packageName))
-                .reduce((acc, packageName) => {
-                const version = usersLock.packages[`node_modules/${packageName}`].version;
-                acc.push(`${packageName}@${version}`);
-                return acc;
-            }, []);
-            if (packageNames.length) {
-                const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
-                yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
-            }
-            yield fs.promises.writeFile(hashPath, fullHash);
         });
     }
     watchForReprepare(_a) {

package/dist/types/AdminForthConfig.js

@@ -1,3 +1,4 @@
+;
 export var AdminForthMenuTypes;
 (function (AdminForthMenuTypes) {
     /**

package/index.ts

@@ -717,11 +717,8 @@ class AdminForth implements IAdminForth {
             const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
             if (beforeLoginConfirmation?.length){
               for (const hook of beforeLoginConfirmation) {
-                const resp = await hook({ adminUser });
-                if (resp?.body?.setCookie){
-                  resp?.body?.setCookie.forEach((cookie) => {
-                    this.auth.setCustomCookie({response,payload:cookie})});
-                }
+                const resp = await hook({ adminUser, response });
+                
                 if (resp?.body?.redirectTo) {
                   toReturn = {ok:resp.ok, redirectTo:resp?.body?.redirectTo, allowedLogin:resp?.body?.allowedLogin};
                   break;

package/modules/codeInjector.ts

@@ -271,7 +271,7 @@ class CodeInjector implements ICodeInjector {
     const collections = new Set(icons.map((icon) => icon.split(':')[0]));
 
     // package names @iconify-prerendered/vue-<collection name>
-    const packageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
+    const iconPackageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
 
     // for each icon generate import statement
     const iconImports = uniqueIcons.map((icon) => {
@@ -411,16 +411,30 @@ class CodeInjector implements ICodeInjector {
     const spaLockHash = hashify(spaPackageLock);
 
     /* customPackageLock */
-    const usersPackagePath = path.join('./package.json');
-    const usersPackage = JSON.parse(await fs.promises.readFile(usersPackagePath, 'utf-8'));
-
-    const usersLockPath = path.join('./package-lock.json');
-    const usersLock = JSON.parse(await fs.promises.readFile(usersLockPath, 'utf-8'));
-    const usersLockHash = hashify(usersLock);
+    let usersLockHash = '';
+    let usersLock = null;
+    if (this.adminforth.config.customization?.customComponentsDir) {
+      const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
+      let usersPackage = null;
+      try {
+        usersPackage = JSON.parse(await fs.promises.readFile(usersPackagePath, 'utf-8'));
+      } catch (e) {
+        // user package.json does not exist, user does not have custom components
+      }
+      if (usersPackage) {
+        const usersLockPath = path.join(this.adminforth.config.customization.customComponentsDir, 'package-lock.json');
+        try {
+          usersLock = JSON.parse(await fs.promises.readFile(usersLockPath, 'utf-8'));
+        } catch (e) {
+          throw new Error(`Custom package-lock.json does not exist in ${this.adminforth.config.customization.customComponentsDir}, but package.json does. 
+            We can't determine version of packages without package-lock.json. Please run npm install in ${this.adminforth.config.customization.customComponentsDir}`);
+        }
+        usersLockHash = hashify(usersLock);
+      }
 
-    const packagesNamesHash = hashify(packageNames);
+    const iconPackagesNamesHash = hashify(iconPackageNames);
 
-    const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
+    const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
     const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
 
     try {
@@ -442,25 +456,29 @@ class CodeInjector implements ICodeInjector {
 
     await this.runNpmShell({command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH});
 
-    // get packages with version from customPackage
-    const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon', 'adminforth'];
-    const customPackgeNames = [...Object.keys(usersPackage.dependencies), ...Object.keys(usersPackage.devDependencies || [])]
-      .filter((packageName) => !IGNORE_PACKAGES.includes(packageName))
-      .reduce(
-        (acc, packageName) => {
-          const version = usersLock.packages[`node_modules/${packageName}`].version;
-          acc.push(`${packageName}@${version}`);
-          return acc;
-        }, []);
-
-    if (packageNames.length) {
-      const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
+    let customPackgeNames = [];
+    if (usersPackage && usersLock) {
+      customPackgeNames = [
+        ...Object.keys(usersPackage.dependencies),
+        ...Object.keys(usersPackage.devDependencies || [])
+      ].reduce(
+          (acc, packageName) => {
+            const version = usersLock.packages[`node_modules/${packageName}`].version;
+            acc.push(`${packageName}@${version}`);
+            return acc;
+          }, []
+      );
+    }
+
+    if (iconPackageNames.length) {
+      const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
       await this.runNpmShell({command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH});
     }
 
     await fs.promises.writeFile(hashPath, fullHash);
 
   }
+}
 
 async watchForReprepare({ verbose }) {
     const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.103",
+  "version": "1.1.105",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/types/AdminForthConfig.ts

@@ -5,6 +5,11 @@ export interface ICodeInjector {
   allComponentNames: Object;
 }
 
+export interface IAdminForthHttpResponse {
+    setHeader: (key: string, value: string) => void,
+    setStatus: (code: number, message: string) => void,
+};
+
 /**
  * Implement this interface to create custom HTTP server adapter for AdminForth.
  */
@@ -28,10 +33,13 @@ export interface IHttpServer {
     method: string,
     noAuth?: boolean,
     path: string,
-    handler: (body: any, adminUser: any, query: {[key: string]: string}, headers: {[key: string]: string}, cookies: {[key: string]: string}, response: {
-      setHeader: (key: string, value: string) => void,
-      setStatus: (code: number, message: string) => void,
-    }) => void,
+    handler: (
+      body: any, 
+      adminUser: any, 
+      query: {[key: string]: string}, 
+      headers: {[key: string]: string}, cookies: {[key: string]: string}, 
+      response: IAdminForthHttpResponse,
+    ) => void,
   }): void;
 
 }
@@ -615,7 +623,17 @@ export type AfterSaveFunction = (params: {resource: AdminForthResource, adminUse
 /**
  * Allow to get user data before login confirmation, will triger when user try to login.
  */
-export type BeforeLoginConfirmationFunction = (params?: { adminUser: AdminUser }) => Promise<{ok:boolean, error?:string, body:{setCookie?:[], redirectTo?: 'string', allowedLogin?: boolean   }}>;
+export type BeforeLoginConfirmationFunction = (params?: { 
+    adminUser: AdminUser,
+    response: IAdminForthHttpResponse,
+}) => Promise<{
+  ok:boolean, 
+  error?:string, 
+  body: {
+    redirectTo?: 'string', 
+    allowedLogin?: boolean,
+  }
+}>;
 
 /**
  * Resource describes one table or collection in database.