adminforth 1.2.99 → 1.3.1

package/dist/modules/restApi.js

@@ -47,67 +47,58 @@ export default class AdminForthRestAPI {
                 const { username, password } = body;
                 let adminUser;
                 let toReturn = { ok: true, allowedLogin: true };
-                let token;
-                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 {
-                    // get resource from db
-                    if (!this.adminforth.config.auth) {
-                        throw new Error('No config.auth defined');
-                    }
-                    const userResource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.resourceId);
-                    // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
-                    if (!userResource.dataSourceColumns.find((col) => col.name === this.adminforth.config.auth.passwordHashField)) {
-                        userResource.dataSourceColumns.push({
-                            name: this.adminforth.config.auth.passwordHashField,
-                            backendOnly: true,
-                            showIn: [],
-                            type: AdminForthDataTypes.STRING,
-                        });
-                        console.log('Adding passwordHashField to userResource', userResource);
-                    }
-                    const userRecord = (_b = (yield this.adminforth.connectors[userResource.dataSource].getData({
-                        resource: userResource,
-                        filters: [
-                            { field: this.adminforth.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
-                        ],
-                        limit: 1,
-                        offset: 0,
-                        sort: [],
-                    })).data) === null || _b === void 0 ? void 0 : _b[0];
-                    if (!userRecord) {
-                        return { error: 'User not found' };
-                    }
-                    const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
-                    const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);
-                    if (valid) {
-                        adminUser = {
-                            isRoot: false, dbUser: userRecord,
-                            pk: userRecord[userResource.columns.find((col) => col.primaryKey).name],
-                            username,
-                        };
-                        const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation;
-                        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 };
-                                    break;
-                                }
+                // get resource from db
+                if (!this.adminforth.config.auth) {
+                    throw new Error('No config.auth defined we need it to find user, please follow the docs');
+                }
+                const userResource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId);
+                // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
+                if (!userResource.dataSourceColumns.find((col) => col.name === this.adminforth.config.auth.passwordHashField)) {
+                    userResource.dataSourceColumns.push({
+                        name: this.adminforth.config.auth.passwordHashField,
+                        backendOnly: true,
+                        showIn: [],
+                        type: AdminForthDataTypes.STRING,
+                    });
+                    console.log('Adding passwordHashField to userResource', userResource);
+                }
+                const userRecord = (_b = (yield this.adminforth.connectors[userResource.dataSource].getData({
+                    resource: userResource,
+                    filters: [
+                        { field: this.adminforth.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
+                    ],
+                    limit: 1,
+                    offset: 0,
+                    sort: [],
+                })).data) === null || _b === void 0 ? void 0 : _b[0];
+                if (!userRecord) {
+                    return { error: 'User not found' };
+                }
+                const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
+                const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);
+                if (valid) {
+                    adminUser = {
+                        dbUser: userRecord,
+                        pk: userRecord[userResource.columns.find((col) => col.primaryKey).name],
+                        username,
+                    };
+                    const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation;
+                    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 };
+                                break;
                             }
                         }
-                        if (toReturn.allowedLogin) {
-                            this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
-                        }
                     }
-                    else {
-                        return { error: INVALID_MESSAGE };
+                    if (toReturn.allowedLogin) {
+                        this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
                     }
                 }
+                else {
+                    return { error: INVALID_MESSAGE };
+                }
                 return toReturn;
             })
         });
@@ -138,7 +129,7 @@ export default class AdminForthRestAPI {
                     throw new Error('No config.auth defined');
                 }
                 const usernameField = this.adminforth.config.auth.usernameField;
-                const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.resourceId);
+                const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId);
                 const usernameColumn = resource.columns.find((col) => col.name === usernameField);
                 return {
                     brandName: this.adminforth.config.customization.brandName,
@@ -154,18 +145,12 @@ export default class AdminForthRestAPI {
             method: 'GET',
             path: '/get_base_config',
             handler: (_k) => __awaiter(this, [_k], void 0, function* ({ input, adminUser, cookies }) {
-                var _l, _m, _o, _p, _q;
+                var _l, _m, _o, _p;
                 let username = '';
                 let userFullName = '';
-                if (adminUser.isRoot) {
-                    // isRoot can be in JWT token still when rootUser deleted, so we check for rootUser?"
-                    username = ((_l = this.adminforth.config.rootUser) === null || _l === void 0 ? void 0 : _l.username) || 'RootUser';
-                }
-                else {
-                    const dbUser = adminUser.dbUser;
-                    username = dbUser[this.adminforth.config.auth.usernameField];
-                    userFullName = dbUser[this.adminforth.config.auth.userFullNameField];
-                }
+                const dbUser = adminUser.dbUser;
+                username = dbUser[this.adminforth.config.auth.usernameField];
+                userFullName = dbUser[this.adminforth.config.auth.userFullNameField];
                 const userData = {
                     [this.adminforth.config.auth.usernameField]: username,
                     [this.adminforth.config.auth.userFullNameField]: userFullName
@@ -213,7 +198,7 @@ export default class AdminForthRestAPI {
                     yield processMenuItem(newMenuItem);
                     newMenu.push(newMenuItem);
                 }
-                const announcementBadge = (_o = (_m = this.adminforth.config.customization).announcementBadge) === null || _o === void 0 ? void 0 : _o.call(_m, adminUser);
+                const announcementBadge = (_m = (_l = this.adminforth.config.customization).announcementBadge) === null || _m === void 0 ? void 0 : _m.call(_l, adminUser);
                 return {
                     user: userData,
                     resources: this.adminforth.config.resources.map((res) => ({
@@ -228,8 +213,8 @@ export default class AdminForthRestAPI {
                         deleteConfirmation: this.adminforth.config.deleteConfirmation,
                         auth: this.adminforth.config.auth,
                         usernameField: this.adminforth.config.auth.usernameField,
-                        title: (_p = this.adminforth.config.customization) === null || _p === void 0 ? void 0 : _p.title,
-                        emptyFieldPlaceholder: (_q = this.adminforth.config.customization) === null || _q === void 0 ? void 0 : _q.emptyFieldPlaceholder,
+                        title: (_o = this.adminforth.config.customization) === null || _o === void 0 ? void 0 : _o.title,
+                        emptyFieldPlaceholder: (_p = this.adminforth.config.customization) === null || _p === void 0 ? void 0 : _p.emptyFieldPlaceholder,
                         announcementBadge,
                     },
                     adminUser,
@@ -247,7 +232,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_resource',
-            handler: (_r) => __awaiter(this, [_r], void 0, function* ({ body, adminUser }) {
+            handler: (_q) => __awaiter(this, [_q], void 0, function* ({ body, adminUser }) {
                 const { resourceId } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -278,8 +263,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body, adminUser }) {
-                var _t, _u, _v, _w;
+            handler: (_r) => __awaiter(this, [_r], void 0, function* ({ body, adminUser }) {
+                var _s, _t, _u, _v;
                 const { resourceId, source } = body;
                 if (['show', 'list'].includes(source) === false) {
                     return { error: 'Invalid source, should be list or show' };
@@ -299,7 +284,7 @@ export default class AdminForthRestAPI {
                 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((_t = (_s = resource.hooks) === null || _s === void 0 ? void 0 : _s[source]) === null || _t === void 0 ? void 0 : _t.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' } `);
@@ -378,7 +363,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((_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((_v = (_u = resource.hooks) === null || _u === void 0 ? void 0 : _u[source]) === null || _v === void 0 ? void 0 : _v.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' } `);
@@ -393,8 +378,8 @@ export default class AdminForthRestAPI {
         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: (_w) => __awaiter(this, [_w], void 0, function* ({ body, adminUser }) {
+                var _x, _y, _z, _0;
                 const { resourceId, column } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -415,7 +400,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((_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((_y = (_x = columnConfig.foreignResource.hooks) === null || _x === void 0 ? void 0 : _x.dropdownList) === null || _y === void 0 ? void 0 : _y.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' } `);
@@ -444,7 +429,7 @@ export default class AdminForthRestAPI {
                 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((_0 = (_z = columnConfig.foreignResource.hooks) === null || _z === void 0 ? void 0 : _z.dropdownList) === null || _0 === void 0 ? void 0 : _0.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' } `);
@@ -459,7 +444,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_2) => __awaiter(this, [_2], void 0, function* ({ body }) {
+            handler: (_1) => __awaiter(this, [_1], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.adminforth.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -488,7 +473,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_3) => __awaiter(this, [_3], void 0, function* ({ body, adminUser }) {
+            handler: (_2) => __awaiter(this, [_2], 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` };
@@ -512,8 +497,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
-                var _5, _6, _7, _8;
+            handler: (_3) => __awaiter(this, [_3], void 0, function* ({ body, adminUser }) {
+                var _4, _5, _6, _7;
                 const resource = this.adminforth.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -532,7 +517,7 @@ export default class AdminForthRestAPI {
                     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((_5 = (_4 = resource.hooks) === null || _4 === void 0 ? void 0 : _4.edit) === null || _5 === void 0 ? void 0 : _5.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' } `);
@@ -559,7 +544,7 @@ export default class AdminForthRestAPI {
                     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((_7 = (_6 = resource.hooks) === null || _6 === void 0 ? void 0 : _6.edit) === null || _7 === void 0 ? void 0 : _7.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' } `);
@@ -576,8 +561,8 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body, adminUser }) {
-                var _10, _11, _12, _13;
+            handler: (_8) => __awaiter(this, [_8], void 0, function* ({ body, adminUser }) {
+                var _9, _10, _11, _12;
                 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) {
@@ -595,7 +580,7 @@ export default class AdminForthRestAPI {
                     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((_10 = (_9 = resource.hooks) === null || _9 === void 0 ? void 0 : _9.delete) === null || _10 === void 0 ? void 0 : _10.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' } `);
@@ -607,7 +592,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((_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((_12 = (_11 = resource.hooks) === null || _11 === void 0 ? void 0 : _11.delete) === null || _12 === void 0 ? void 0 : _12.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' } `);
@@ -624,7 +609,7 @@ export default class AdminForthRestAPI {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_14) => __awaiter(this, [_14], void 0, function* ({ body, adminUser }) {
+            handler: (_13) => __awaiter(this, [_13], 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/utils.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import Fuse from 'fuse.js';
 // @ts-ignore-next-line
 const csscolors = {
     "aliceblue": "#f0f8ff",
@@ -307,3 +308,20 @@ export function inverseRGBA(rgba) {
     let brightness = (r * 299 + g * 587 + b * 114) / 1000;
     return brightness > 128 ? 'rgba(0,0,0,1)' : 'rgba(255,255,255,1)';
 }
+export function suggestIfTypo(names, name) {
+    console.log('names', names);
+    console.log('name', name);
+    if (!name) {
+        return null;
+    }
+    const options = {
+        includeScore: true, // Includes score in the results to see how close matches are
+        threshold: 0.3, // Defines the fuzziness (lower values mean stricter matches)
+    };
+    const fuse = new Fuse(names.filter((n) => !!n), options);
+    // Search for a resource
+    const result = fuse.search(name);
+    if (result.length > 0) {
+        return result[0].item;
+    }
+}

package/index.ts

@@ -5,7 +5,7 @@ import PostgresConnector from './dataConnectors/postgres.js';
 import SQLiteConnector from './dataConnectors/sqlite.js';
 import CodeInjector from './modules/codeInjector.js';
 import ExpressServer from './servers/express.js';
-import { ADMINFORTH_VERSION, listify } from './modules/utils.js';
+import { ADMINFORTH_VERSION, listify, suggestIfTypo } from './modules/utils.js';
 import { 
   type AdminForthConfig, 
   type IAdminForth, 
@@ -22,11 +22,13 @@ import AdminForthPlugin from './basePlugin.js';
 import ConfigValidator from './modules/configValidator.js';
 import AdminForthRestAPI, { interpretResource } from './modules/restApi.js';
 import ClickhouseConnector from './dataConnectors/clickhouse.js';
+import OperationalResource from './modules/operationalResource.js';
 
 // exports
 export * from './types/AdminForthConfig.js'; 
 export { interpretResource };
 export { AdminForthPlugin };
+export { suggestIfTypo };
 
 
 class AdminForth implements IAdminForth {
@@ -52,7 +54,7 @@ class AdminForth implements IAdminForth {
   activatedPlugins: Array<AdminForthPlugin>;
   configValidator: IConfigValidator;
   restApi: AdminForthRestAPI;
-  resourceInstances: {
+  operationalResources: {
     [resourceId: string]: IOperationalResource,
   }
   baseUrlSlashed: string;
@@ -120,21 +122,24 @@ class AdminForth implements IAdminForth {
     this.config.dataSources.forEach((ds) => {
       const dbType = ds.url.split(':')[0];
       if (!this.config.databaseConnectors[dbType]) {
-        throw new Error(`Database type ${dbType} is not supported, consider using databaseConnectors in AdminForth config`);
+        throw new Error(`Database type '${dbType}' is not supported, consider using one of ${Object.keys(this.connectorClasses).join(', ')} or create your own data-source connector`);
       }
       this.connectors[ds.id] = new this.config.databaseConnectors[dbType]({url: ds.url});  
     });
 
     await Promise.all(this.config.resources.map(async (res) => {
       if (!this.connectors[res.dataSource]) {
-        throw new Error(`Resource '${res.table}' refers to unknown dataSource '${res.dataSource}'`);
+        const similar = suggestIfTypo(Object.keys(this.connectors), res.dataSource);
+        throw new Error(`Resource '${res.table}' refers to unknown dataSource '${res.dataSource}' ${similar 
+          ? `. Did you mean '${similar}'?` : 'Available dataSources: '+Object.keys(this.connectors).join(', ')}`
+        );
       }
       const fieldTypes = await this.connectors[res.dataSource].discoverFields(res);
       if (fieldTypes !== null && !Object.keys(fieldTypes).length) {
         throw new Error(`Table '${res.table}' (In resource '${res.resourceId}') has no fields or does not exist`);
       }
       if (fieldTypes === null) {
-        console.error(`DataSource ${res.dataSource} was not able to perform field discovery. It will not work properly`);
+        console.error(`⛔ DataSource ${res.dataSource} was not able to perform field discovery. It will not work properly`);
         return;
       }
       if (!res.columns) {
@@ -143,7 +148,8 @@ class AdminForth implements IAdminForth {
 
       res.columns.forEach((col, i) => {
         if (!fieldTypes[col.name] && !col.virtual) {
-          throw new Error(`Resource '${res.table}' has no column '${col.name}'`);
+          const similar = suggestIfTypo(Object.keys(fieldTypes), col.name);
+          throw new Error(`Resource '${res.table}' has no column '${col.name}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
         }
         // first find discovered values, but allow override
         res.columns[i] = { ...fieldTypes[col.name], ...col };
@@ -160,6 +166,11 @@ class AdminForth implements IAdminForth {
 
     this.statuses.dbDiscover = 'done';
 
+    this.operationalResources = {};
+    this.config.resources.forEach((resource) => {
+      this.operationalResources[resource.resourceId] = new OperationalResource(this.connectors[resource.dataSource], resource);
+    });
+
     // console.log('⚙️⚙️⚙️ Database discovery done', JSON.stringify(this.config.resources, null, 2));
   }
 
@@ -168,9 +179,12 @@ class AdminForth implements IAdminForth {
   }
 
   async getUserByPk(pk: string) {
-    const resource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
+    const resource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
     if (!resource) {
-      throw new Error('No auth resource found');
+      const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId), this.config.auth.usersResourceId);
+      throw new Error(`No resource with  ${this.config.auth.usersResourceId} found. ${similar ? 
+        `Did you mean '${similar}' in config.auth.usersResourceId?` : 'Please set correct resource in config.auth.usersResourceId'}`
+      );
     }
     const users = await this.connectors[resource.dataSource].getData({
       resource,
@@ -186,13 +200,6 @@ class AdminForth implements IAdminForth {
 
   async createResourceRecord({ resource, record, adminUser }: { resource: AdminForthResource, record: any, adminUser: AdminUser }) {
     for (const column of resource.columns) {
-        if (column.fillOnCreate) {
-            if (record[column.name] === undefined) {
-                record[column.name] = column.fillOnCreate({
-                    initialRecord: record, adminUser
-                 });
-            }
-        }
         if (
             (column.required as {create?: boolean, edit?: boolean}) ?.create &&
             record[column.name] === undefined &&
@@ -235,7 +242,7 @@ class AdminForth implements IAdminForth {
     }
     const connector = this.connectors[resource.dataSource];
     process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record createResourceRecord', record);
-    await connector.createRecord({ resource, record });
+    await connector.createRecord({ resource, record, adminUser });
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.afterSave as AfterSaveFunction[])) {
       console.log('Hook afterSave', hook);
@@ -253,7 +260,20 @@ class AdminForth implements IAdminForth {
   }
 
   resource(resourceId: string) {
-    return this.config.resources.find((res) => res.resourceId === resourceId);
+    if (this.statuses.dbDiscover !== 'done') {
+      if (this.statuses.dbDiscover === 'running') {
+        throw new Error('Database discovery is running. You can\'t use data API while database discovery is not finished.\n'+
+          'Consider moving your code to a place where it will be executed after database discovery is already done (after await admin.discoverDatabases())');
+      } else {
+        throw new Error('Database discovery is not yet started. You can\'t use data API before database discovery is done. \n'+
+          'Call admin.discoverDatabases() first and await it before using data API');
+      }
+    }
+    if (!this.operationalResources[resourceId]) {
+      const closeName = suggestIfTypo(Object.keys(this.operationalResources), resourceId);
+      throw new Error(`Resource with id '${resourceId}' not found${closeName ? `. Did you mean '${closeName}'?` : ''}`);
+    }
+    return this.operationalResources[resourceId];
   }
 
   setupEndpoints(server: IHttpServer) {

package/modules/configValidator.ts

@@ -10,7 +10,7 @@ import {
 
 import fs from 'fs';
 import path from 'path';
-import { guessLabelFromName } from './utils.js';
+import { guessLabelFromName, suggestIfTypo } from './utils.js';
 
 import crypto from 'crypto';
 
@@ -51,17 +51,6 @@ export default class ConfigValidator implements IConfigValidator {
   validateConfig() {
     const errors = [];
 
-    if (this.config.rootUser) {
-      if (!this.config.rootUser.username) {
-        throw new Error('rootUser.username is required');
-      }
-      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 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';
     }
@@ -74,8 +63,13 @@ export default class ConfigValidator implements IConfigValidator {
     }
 
     if (this.config.auth) {
-      if (!this.config.auth.resourceId) {
-        throw new Error('No config.auth.resourceId defined');
+      // TODO: remove in future releases
+      if (!this.config.auth.usersResourceId && this.config.auth.resourceId) {
+        this.config.auth.usersResourceId = this.config.auth.resourceId;
+      }
+
+      if (!this.config.auth.usersResourceId) {
+        throw new Error('No config.auth.usersResourceId defined');
       }
       if (!this.config.auth.passwordHashField) {
         throw new Error('No config.auth.passwordHashField defined');
@@ -86,9 +80,10 @@ export default class ConfigValidator implements IConfigValidator {
       if (this.config.auth.loginBackgroundImage) {
         errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
       }
-      const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
+      const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
       if (!userResource) {
-        throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
+        const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId || res.table), this.config.auth.usersResourceId);
+        throw new Error(`Resource with id "${this.config.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
       }
 
       if (!this.config.auth.beforeLoginConfirmation) {

package/modules/operationalResource.ts

@@ -1,40 +1,15 @@
 import { IAdminForthFilter, IAdminForthSort, IOperationalResource, IAdminForthDataSourceConnectorBase, AdminForthResource, IAdminForth } from '../types/AdminForthConfig.js';
 
 
-// export interface IOperationalResource {
-//   get: (filters: IAdminForthFilter | IAdminForthFilter[]) => Promise<any[]>;
-
-//   list: (filters: IAdminForthFilter | IAdminForthFilter[], limit: number, offset: number, sort: IAdminForthSort | IAdminForthSort[]) => Promise<any[]>;
-
-//   count: (filters: IAdminForthFilter | IAdminForthFilter[]) => Promise<number>;
-
-//   create: (record: any) => Promise<any>;
-
-//   update: (primaryKey: any, record: any) => Promise<any>;
-
-//   delete: (primaryKey: any) => Promise<boolean>;
-
-//   deleteMany: (primaryKeys: any[]) => Promise<boolean>;
-// }
-
-
-// async getData({ resource, limit, offset, sort, filters }: { 
-//   resource: AdminForthResource, 
-//   limit: number, 
-//   offset: number, 
-//   sort: { field: string, direction: AdminForthSortDirections }[], 
-//   filters: { field: string, operator: AdminForthFilterOperators, value: any }[]
-// }): Promise<{ data: any[], total: number }> {
-
 function filtersIfFilter(filter: IAdminForthFilter | IAdminForthFilter[]): IAdminForthFilter[] {
-  return (typeof filter === 'object' ? [filter] : filter) as IAdminForthFilter[];
+  return (Array.isArray(filter) ? filter : [filter]) as IAdminForthFilter[];
 }
 
 function sortsIfSort(sort: IAdminForthSort | IAdminForthSort[]): IAdminForthSort[] {
-  return (typeof sort === 'object' ? [sort] : sort) as IAdminForthSort[];
+  return (Array.isArray(sort) ? sort : [sort]) as IAdminForthSort[];
 }
 
-export class OperationalResource implements IOperationalResource {
+export default class OperationalResource implements IOperationalResource {
   dataConnector: IAdminForthDataSourceConnectorBase;
   resourceConfig: AdminForthResource;
 
@@ -43,14 +18,16 @@ export class OperationalResource implements IOperationalResource {
     this.resourceConfig = resourceConfig;
   }
 
-  async get(filter: IAdminForthFilter | IAdminForthFilter[]): Promise<any[]> {
-    return await this.dataConnector.getData({
-      resource: this.resourceConfig,
-      filters: filtersIfFilter(filter),
-      limit: 1,
-      offset: 0,
-      sort: [],
-    })[0];
+  async get(filter: IAdminForthFilter | IAdminForthFilter[]): Promise<any | null> {
+    return (
+      await this.dataConnector.getData({
+        resource: this.resourceConfig,
+        filters: filtersIfFilter(filter),
+        limit: 1,
+        offset: 0,
+        sort: [],
+      })
+    ).data[0] || null;
   }
 
   async list(
@@ -78,7 +55,7 @@ export class OperationalResource implements IOperationalResource {
   }
 
   async create(record: any): Promise<any> {
-    return await this.dataConnector.createRecord({ resource: this.resourceConfig, record });
+    return await this.dataConnector.createRecord({ resource: this.resourceConfig, record, adminUser: null });
   }
 
   async update(primaryKey: any, record: any): Promise<any> {
@@ -92,6 +69,5 @@ export class OperationalResource implements IOperationalResource {
   async delete(primaryKey: any): Promise<boolean> {
     return await this.dataConnector.deleteRecord({ resource: this.resourceConfig, recordId: primaryKey });
   }
-  
 
 }