adminforth 1.1.101 → 1.1.103

package/dataConnectors/baseConnector.ts

@@ -46,7 +46,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
   createRecord({ resource, record }: { resource: AdminForthResource; record: any; }): Promise<void> {
     // transform value using setFieldValue and call createRecordOriginalValues
-    const newRecord = {};
+    const newRecord = {...record};
     for (const col of resource.dataSourceColumns) {
         newRecord[col.name] = this.setFieldValue(col, record[col.name]);
     }

package/dist/dataConnectors/baseConnector.js

@@ -39,7 +39,7 @@ export default class AdminForthBaseConnector {
     }
     createRecord({ resource, record }) {
         // transform value using setFieldValue and call createRecordOriginalValues
-        const newRecord = {};
+        const newRecord = Object.assign({}, record);
         for (const col of resource.dataSourceColumns) {
             newRecord[col.name] = this.setFieldValue(col, record[col.name]);
         }

package/dist/index.js

@@ -101,7 +101,7 @@ class AdminForth {
         catch (e) {
             this.config.customization.customComponentsDir = undefined;
         }
-        if (this.config.auth) {
+        if (!this.config.auth) {
             if (!this.config.auth.resourceId) {
                 throw new Error('No config.auth.resourceId defined');
             }
@@ -118,6 +118,9 @@ class AdminForth {
             if (!userResource) {
                 throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
             }
+            if (!this.config.auth.beforeLoginConfirmation) {
+                this.config.auth.beforeLoginConfirmation = [];
+            }
         }
         if (!this.config.customization) {
             this.config.customization = {};
@@ -614,12 +617,12 @@ class AdminForth {
                         adminUser = {
                             isRoot: false, dbUser: userRecord,
                             pk: userRecord[userResource.columns.find((col) => col.primaryKey).name],
-                            username
+                            username,
                         };
                         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({ userRecord: adminUser });
+                                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 });

package/index.ts

@@ -138,7 +138,7 @@ class AdminForth implements IAdminForth {
       this.config.customization.customComponentsDir = undefined;
     }
 
-    if (this.config.auth) {
+    if (!this.config.auth) {
       if (!this.config.auth.resourceId) {
         throw new Error('No config.auth.resourceId defined');
       }
@@ -155,6 +155,10 @@ class AdminForth implements IAdminForth {
       if (!userResource) {
         throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
       }
+
+      if (!this.config.auth.beforeLoginConfirmation) {
+        this.config.auth.beforeLoginConfirmation = [];
+      }
     }
 
     if (!this.config.customization) {
@@ -708,12 +712,12 @@ class AdminForth implements IAdminForth {
             adminUser = { 
               isRoot: false, dbUser: userRecord,
               pk: userRecord[userResource.columns.find((col) => col.primaryKey).name], 
-              username
+              username,
             };
             const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
             if (beforeLoginConfirmation?.length){
               for (const hook of beforeLoginConfirmation) {
-                const resp = await hook({ userRecord:adminUser});
+                const resp = await hook({ adminUser });
                 if (resp?.body?.setCookie){
                   resp?.body?.setCookie.forEach((cookie) => {
                     this.auth.setCustomCookie({response,payload:cookie})});

package/package.json

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

package/types/AdminForthConfig.ts

@@ -615,7 +615,7 @@ 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?: { userRecord: AdminUser }) => Promise<{ok:boolean, error?:string, body:{setCookie?:[], redirectTo?: 'string', allowedLogin?: boolean   }}>;
+export type BeforeLoginConfirmationFunction = (params?: { adminUser: AdminUser }) => Promise<{ok:boolean, error?:string, body:{setCookie?:[], redirectTo?: 'string', allowedLogin?: boolean   }}>;
 
 /**
  * Resource describes one table or collection in database.