adminforth 1.2.51 → 1.2.52

package/dist/modules/configValidator.js

@@ -54,7 +54,7 @@ export default class ConfigValidator {
             if (!this.config.rootUser.password) {
                 throw new Error('rootUser.password is required');
             }
-            console.log('\n ⚠️⚠️⚠️ [INSECURE ALERT] config.rootUser is set, please create a new user and remove config.rootUser from config ASAP when you are in production\n');
+            console.log('\n ☝️☝️☝️ [INSECURE ALERT] config.rootUser is set, please create a new user to login in backoffice and remove config.rootUser from config ASAP when you are in production\n');
         }
         if (!this.config.customization.customComponentsDir) {
             this.config.customization.customComponentsDir = './custom';

package/dist/modules/restApi.js

@@ -20,13 +20,15 @@ export default class AdminForthRestAPI {
             method: 'POST',
             path: '/login',
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
-                var _b, _c, _d, _e;
+                var _b, _c, _d, _e, _f;
                 const INVALID_MESSAGE = 'Invalid username or password';
                 const { username, password } = body;
                 let adminUser;
                 let toReturn = { ok: true, allowedLogin: true };
                 let token;
-                if (username === this.adminforth.config.rootUser.username && password === this.adminforth.config.rootUser.password) {
+                if (this.adminforth.config.rootUser
+                    && username === this.adminforth.config.rootUser.username
+                    && password === ((_b = this.adminforth.config.rootUser) === null || _b === void 0 ? void 0 : _b.password)) {
                     this.adminforth.auth.setAuthCookie({ response, username, pk: null });
                     adminUser = { isRoot: true, dbUser: null, pk: null, username: this.adminforth.config.rootUser.username };
                 }
@@ -46,7 +48,7 @@ export default class AdminForthRestAPI {
                         });
                         console.log('Adding passwordHashField to userResource', userResource);
                     }
-                    const userRecord = (_b = (yield this.adminforth.connectors[userResource.dataSource].getData({
+                    const userRecord = (_c = (yield this.adminforth.connectors[userResource.dataSource].getData({
                         resource: userResource,
                         filters: [
                             { field: this.adminforth.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
@@ -54,7 +56,7 @@ export default class AdminForthRestAPI {
                         limit: 1,
                         offset: 0,
                         sort: [],
-                    })).data) === null || _b === void 0 ? void 0 : _b[0];
+                    })).data) === null || _c === void 0 ? void 0 : _c[0];
                     if (!userRecord) {
                         return { error: 'User not found' };
                     }
@@ -70,8 +72,8 @@ export default class AdminForthRestAPI {
                         if (beforeLoginConfirmation === null || beforeLoginConfirmation === void 0 ? void 0 : beforeLoginConfirmation.length) {
                             for (const hook of beforeLoginConfirmation) {
                                 const resp = yield hook({ adminUser, response });
-                                if ((_c = resp === null || resp === void 0 ? void 0 : resp.body) === null || _c === void 0 ? void 0 : _c.redirectTo) {
-                                    toReturn = { ok: resp.ok, redirectTo: (_d = resp === null || resp === void 0 ? void 0 : resp.body) === null || _d === void 0 ? void 0 : _d.redirectTo, allowedLogin: (_e = resp === null || resp === void 0 ? void 0 : resp.body) === null || _e === void 0 ? void 0 : _e.allowedLogin };
+                                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;
                                 }
                             }
@@ -90,7 +92,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/check_auth',
-            handler: (_f) => __awaiter(this, [_f], void 0, function* ({ adminUser }) {
+            handler: (_g) => __awaiter(this, [_g], void 0, function* ({ adminUser }) {
                 return { ok: true };
             }),
         });
@@ -98,7 +100,7 @@ export default class AdminForthRestAPI {
             noAuth: true,
             method: 'POST',
             path: '/logout',
-            handler: (_g) => __awaiter(this, [_g], void 0, function* ({ response }) {
+            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ response }) {
                 this.adminforth.auth.removeAuthCookie(response);
                 return { ok: true };
             }),
@@ -107,8 +109,8 @@ export default class AdminForthRestAPI {
             noAuth: true,
             method: 'GET',
             path: '/get_public_config',
-            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ body }) {
-                var _j;
+            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ body }) {
+                var _k;
                 // find resource
                 if (!this.adminforth.config.auth) {
                     throw new Error('No config.auth defined');
@@ -120,7 +122,7 @@ export default class AdminForthRestAPI {
                     brandName: this.adminforth.config.customization.brandName,
                     usernameFieldName: usernameColumn.label,
                     loginBackgroundImage: this.adminforth.config.auth.loginBackgroundImage,
-                    title: (_j = this.adminforth.config.customization) === null || _j === void 0 ? void 0 : _j.title,
+                    title: (_k = this.adminforth.config.customization) === null || _k === void 0 ? void 0 : _k.title,
                     demoCredentials: this.adminforth.config.auth.demoCredentials,
                     loginPromptHTML: this.adminforth.config.auth.loginPromptHTML,
                 };
@@ -129,8 +131,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'GET',
             path: '/get_base_config',
-            handler: (_k) => __awaiter(this, [_k], void 0, function* ({ input, adminUser, cookies }) {
-                var _l, _m;
+            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ input, adminUser, cookies }) {
+                var _m, _o;
                 let username = '';
                 let userFullName = '';
                 if (adminUser.isRoot) {
@@ -191,8 +193,8 @@ export default class AdminForthRestAPI {
                         deleteConfirmation: this.adminforth.config.deleteConfirmation,
                         auth: this.adminforth.config.auth,
                         usernameField: this.adminforth.config.auth.usernameField,
-                        title: (_l = this.adminforth.config.customization) === null || _l === void 0 ? void 0 : _l.title,
-                        emptyFieldPlaceholder: (_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.emptyFieldPlaceholder,
+                        title: (_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.title,
+                        emptyFieldPlaceholder: (_o = this.adminforth.config.customization) === null || _o === void 0 ? void 0 : _o.emptyFieldPlaceholder,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,
@@ -231,7 +233,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_resource',
-            handler: (_o) => __awaiter(this, [_o], void 0, function* ({ body, adminUser }) {
+            handler: (_p) => __awaiter(this, [_p], void 0, function* ({ body, adminUser }) {
                 const { resourceId } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -262,8 +264,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_p) => __awaiter(this, [_p], void 0, function* ({ body, adminUser }) {
-                var _q, _r, _s, _t;
+            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' };
@@ -283,7 +285,7 @@ export default class AdminForthRestAPI {
                 if (!allowed) {
                     return { error };
                 }
-                for (const hook of listify((_r = (_q = resource.hooks) === null || _q === void 0 ? void 0 : _q[source]) === null || _r === void 0 ? void 0 : _r.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' } `);
@@ -362,7 +364,7 @@ export default class AdminForthRestAPI {
                     item._label = resource.recordLabel(item);
                 });
                 // only after adminforth made all post processing, give user ability to edit it
-                for (const hook of listify((_t = (_s = resource.hooks) === null || _s === void 0 ? void 0 : _s[source]) === null || _t === void 0 ? void 0 : _t.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' } `);
@@ -377,8 +379,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_foreign_data',
-            handler: (_u) => __awaiter(this, [_u], void 0, function* ({ body, adminUser }) {
-                var _v, _w, _x, _y;
+            handler: (_v) => __awaiter(this, [_v], void 0, function* ({ body, adminUser }) {
+                var _w, _x, _y, _z;
                 const { resourceId, column } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -399,7 +401,7 @@ export default class AdminForthRestAPI {
                 }
                 const targetResourceId = columnConfig.foreignResource.resourceId;
                 const targetResource = this.adminforth.config.resources.find((res) => res.resourceId == targetResourceId);
-                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.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' } `);
@@ -428,7 +430,7 @@ export default class AdminForthRestAPI {
                 const response = {
                     items
                 };
-                for (const hook of listify((_y = (_x = columnConfig.foreignResource.hooks) === null || _x === void 0 ? void 0 : _x.dropdownList) === null || _y === void 0 ? void 0 : _y.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' } `);
@@ -443,7 +445,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_z) => __awaiter(this, [_z], void 0, function* ({ body }) {
+            handler: (_0) => __awaiter(this, [_0], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -472,7 +474,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_0) => __awaiter(this, [_0], void 0, function* ({ body, adminUser }) {
+            handler: (_1) => __awaiter(this, [_1], void 0, function* ({ body, adminUser }) {
                 const resource = this.adminforth.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -496,8 +498,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_1) => __awaiter(this, [_1], void 0, function* ({ body, adminUser }) {
-                var _2, _3, _4, _5;
+            handler: (_2) => __awaiter(this, [_2], void 0, function* ({ body, adminUser }) {
+                var _3, _4, _5, _6;
                 const resource = this.adminforth.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -516,7 +518,7 @@ export default class AdminForthRestAPI {
                     return { error };
                 }
                 // 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.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' } `);
@@ -543,7 +545,7 @@ export default class AdminForthRestAPI {
                     yield connector.updateRecord({ resource, recordId, newValues });
                 }
                 // execute hook if needed
-                for (const hook of listify((_5 = (_4 = resource.hooks) === null || _4 === void 0 ? void 0 : _4.edit) === null || _5 === void 0 ? void 0 : _5.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' } `);
@@ -560,8 +562,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_6) => __awaiter(this, [_6], void 0, function* ({ body, adminUser }) {
-                var _7, _8, _9, _10;
+            handler: (_7) => __awaiter(this, [_7], void 0, function* ({ body, adminUser }) {
+                var _8, _9, _10, _11;
                 const resource = this.adminforth.config.resources.find((res) => res.resourceId == body['resourceId']);
                 const record = yield this.adminforth.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
                 if (!resource) {
@@ -579,7 +581,7 @@ export default class AdminForthRestAPI {
                     return { error };
                 }
                 // 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.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' } `);
@@ -591,7 +593,7 @@ export default class AdminForthRestAPI {
                 const connector = this.adminforth.connectors[resource.dataSource];
                 yield connector.deleteRecord({ resource, recordId: body['primaryKey'] });
                 // execute hook if needed
-                for (const hook of listify((_10 = (_9 = resource.hooks) === null || _9 === void 0 ? void 0 : _9.delete) === null || _10 === void 0 ? void 0 : _10.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' } `);
@@ -608,7 +610,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_11) => __awaiter(this, [_11], void 0, function* ({ body, adminUser }) {
+            handler: (_12) => __awaiter(this, [_12], void 0, function* ({ body, adminUser }) {
                 const { resourceId, actionId, recordIds } = body;
                 const resource = this.adminforth.config.resources.find((res) => res.resourceId == resourceId);
                 if (!resource) {

package/dist/modules/styles.js

@@ -7,11 +7,11 @@ export const styles = () => ({
         lightNavbarTextHover: "alias:lightNavbarText darken", // navbar text hover
         lightNavbarTextActive: "alias:lightNavbarText darken", // navbar text active
         lightNavbarIcons: "alias:lightNavbarText opacity:0.7", // navbar icons
-        lightSidebar: "#ffffff", // sidebar background
-        lightSidebarBorder: "alias:lightSidebarText opacity:0.3", // sidebar right border
-        lightSidebarItemHover: "alias:lightSidebarText opacity:0.1", // sidebar list item hover
-        lightSidebarItemActive: "alias:lightSidebarText opacity:0.4", // sidebar list item active
-        lightSidebarText: "#1f2937", // sidebar list item text
+        lightSidebar: "#f9fafb", // sidebar background
+        lightSidebarBorder: "alias:lightSidebarText opacity:0.05", // sidebar right border
+        lightSidebarItemHover: "alias:lightSidebarText opacity:0.05", // sidebar list item hover
+        lightSidebarItemActive: "alias:lightSidebarText opacity:0.05", // sidebar list item active
+        lightSidebarText: "#213045", // sidebar list item text
         lightSidebarTextHover: "alias:lightSidebarText darken", // sidebar list item text hover
         lightSidebarTextActive: "alias:lightSidebarText darken", // sidebar list item text active
         lightSidebarDevider: "alias:lightSidebarText opacity:0.3", // sidebar devider
@@ -21,7 +21,7 @@ export const styles = () => ({
         lightList: "#FFFFFF", // list view background
         lightListTable: "#FFFFFF", // list view table background
         lightListTableHeading: "alias:lightListTableHeadingText opacity:0.04", // list view table heading
-        lightListTableHeadingText: "#333333", // list view table heading text
+        lightListTableHeadingText: "#43445B", // list view table heading text
         lightListTableText: "#333333", // list view table text
         lightListTableRowHover: "rgb(249 250 251)", // list view row hover
         lightListBreadcrumbsText: "#666666", // list view breadcrumbs text
@@ -87,6 +87,6 @@ export const styles = () => ({
         "headerText-size": "1rem"
     },
     borderRadius: {
-        "default": "2px"
+        "default": ".5rem"
     }
 });

package/modules/configValidator.ts

@@ -59,7 +59,7 @@ export default class ConfigValidator implements IConfigValidator {
         throw new Error('rootUser.password is required');
       }
 
-      console.log('\n ⚠️⚠️⚠️ [INSECURE ALERT] config.rootUser is set, please create a new user and remove config.rootUser from config ASAP when you are in production\n');
+      console.log('\n ☝️☝️☝️ [INSECURE ALERT] config.rootUser is set, please create a new user to login in backoffice and remove config.rootUser from config ASAP when you are in production\n');
     }
 
     if (!this.config.customization.customComponentsDir) {

package/modules/restApi.ts

@@ -42,7 +42,10 @@ export default class AdminForthRestAPI {
         let toReturn: { ok: boolean, redirectTo?: string, allowedLogin:boolean } = { ok: true, allowedLogin:true};
 
         let token;
-        if (username === this.adminforth.config.rootUser.username && password === this.adminforth.config.rootUser.password) {
+        if (this.adminforth.config.rootUser 
+            && username === this.adminforth.config.rootUser.username 
+            && password === this.adminforth.config.rootUser?.password
+        ) {
           this.adminforth.auth.setAuthCookie({ response, username, pk: null });
           adminUser = { isRoot: true, dbUser: null, pk: null, username: this.adminforth.config.rootUser.username};
         } else {

package/modules/styles.ts

@@ -11,11 +11,11 @@ export const styles = () => ({
     lightNavbarTextActive: "alias:lightNavbarText darken", // navbar text active
     lightNavbarIcons: "alias:lightNavbarText opacity:0.7", // navbar icons
 
-    lightSidebar: "#ffffff", // sidebar background
-    lightSidebarBorder: "alias:lightSidebarText opacity:0.3", // sidebar right border
-    lightSidebarItemHover: "alias:lightSidebarText opacity:0.1", // sidebar list item hover
-    lightSidebarItemActive: "alias:lightSidebarText opacity:0.4", // sidebar list item active
-    lightSidebarText: "#1f2937", // sidebar list item text
+    lightSidebar: "#f9fafb", // sidebar background
+    lightSidebarBorder: "alias:lightSidebarText opacity:0.05", // sidebar right border
+    lightSidebarItemHover: "alias:lightSidebarText opacity:0.05", // sidebar list item hover
+    lightSidebarItemActive: "alias:lightSidebarText opacity:0.05", // sidebar list item active
+    lightSidebarText: "#213045", // sidebar list item text
     lightSidebarTextHover: "alias:lightSidebarText darken", // sidebar list item text hover
     lightSidebarTextActive: "alias:lightSidebarText darken", // sidebar list item text active
     lightSidebarDevider: "alias:lightSidebarText opacity:0.3", // sidebar devider
@@ -26,7 +26,7 @@ export const styles = () => ({
     lightList: "#FFFFFF", // list view background
     lightListTable: "#FFFFFF", // list view table background
     lightListTableHeading: "alias:lightListTableHeadingText opacity:0.04", // list view table heading
-    lightListTableHeadingText: "#333333", // list view table heading text
+    lightListTableHeadingText: "#43445B", // list view table heading text
     lightListTableText: "#333333", // list view table text
     lightListTableRowHover: "rgb(249 250 251)", // list view row hover
     lightListBreadcrumbsText: "#666666", // list view breadcrumbs text
@@ -103,7 +103,7 @@ export const styles = () => ({
     "headerText-size": "1rem"
   },
   borderRadius: {
-    "default": "2px"
+    "default": ".5rem"
   }
 });
 

package/package.json

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