adminforth 1.1.65 → 1.1.67

package/auth.ts

@@ -3,6 +3,7 @@ import jwt from 'jsonwebtoken';
 
 import crypto from 'crypto';
 import AdminForth from './index.js';
+import { th } from '@faker-js/faker';
 
 // Function to generate a password hash using PBKDF2
 function calcPasswordHash(password, salt, iterations = 100000, keyLength = 64, digest = 'sha512') {
@@ -26,7 +27,18 @@ class AdminForthAuth {
     this.adminforth = adminforth;
   }
 
-  issueJWT(payload) {
+  removeAuthCookie(response) {
+    response.setHeader('Set-Cookie', `adminforth_jwt=; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
+  }
+
+  setAuthCookie({ response, username, pk}: {
+    response: any, username: string, pk: string | null
+  }) {
+    const token = this.issueJWT({ username, pk, }, 'auth');
+    response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+  }
+
+  issueJWT(payload: Object, type: string) {
     // read ADMINFORH_SECRET from environment if not drop error
     const secret = process.env.ADMINFORTH_SECRET;
     if (!secret) {
@@ -35,10 +47,10 @@ class AdminForthAuth {
 
     // issue JWT token
     const expiresIn = process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h';
-    return jwt.sign(payload, secret, { expiresIn });
+    return jwt.sign({...payload, t: type}, secret, { expiresIn });
   }
 
-  async verify(jwtToken) {
+  async verify(jwtToken: string, mustHaveType: string): Promise<Object> {
     // read ADMINFORH_SECRET from environment if not drop error
     const secret = process.env.ADMINFORTH_SECRET;
     if (!secret) {
@@ -58,7 +70,10 @@ class AdminForthAuth {
       }
       return null;
     }
-    const { pk } = decoded;
+    const { pk, t } = decoded;
+    if (t !== mustHaveType) {
+      throw new Error(`Invalid token type during verification: ${t}, must be ${mustHaveType}`);
+    }
     if (pk === null) {
       decoded.isRoot = true;
     } else {

package/dataConnectors/mongo.ts

@@ -1,11 +1,11 @@
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
-class MongoConnector {
+class MongoConnector implements AdminForthDataSourceConnector {
     db: MongoClient
 
-    constructor({ url }) {
+    constructor({ url }: { url: string }) {
         this.db = new MongoClient(url);
         (async () => {
             try {
@@ -65,16 +65,10 @@ class MongoConnector {
 
     getFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
-          if (!value) {
-            return null;
-          }
-          if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            return dayjs.unix(+value).toISOString();
-          } else if (field._underlineType == 'varchar') {
-            return dayjs.unix(+value).toISOString();
-          } else {
-            throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
-          }
+        if (!value) {
+        return null;
+        }
+        return dayjs.unix(value).toISOString();
 
         } else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {

package/dataConnectors/postgres.ts

@@ -1,11 +1,11 @@
 import dayjs from 'dayjs';
 import pkg from 'pg';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
 const { Client } = pkg;
 
 
-class PostgresConnector {
+class PostgresConnector implements AdminForthDataSourceConnector {
 
     db: any;
 

package/dataConnectors/sqlite.ts

@@ -1,9 +1,9 @@
 import betterSqlite3 from 'better-sqlite3';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
 import dayjs from 'dayjs';
 
-class SQLiteConnector {
+class SQLiteConnector implements AdminForthDataSourceConnector {
 
     db: any;
 

package/dist/auth.js

@@ -27,7 +27,14 @@ class AdminForthAuth {
     constructor(adminforth) {
         this.adminforth = adminforth;
     }
-    issueJWT(payload) {
+    removeAuthCookie(response) {
+        response.setHeader('Set-Cookie', `adminforth_jwt=; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
+    }
+    setAuthCookie({ response, username, pk }) {
+        const token = this.issueJWT({ username, pk, }, 'auth');
+        response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+    }
+    issueJWT(payload, type) {
         // read ADMINFORH_SECRET from environment if not drop error
         const secret = process.env.ADMINFORTH_SECRET;
         if (!secret) {
@@ -35,9 +42,9 @@ class AdminForthAuth {
         }
         // issue JWT token
         const expiresIn = process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h';
-        return jwt.sign(payload, secret, { expiresIn });
+        return jwt.sign(Object.assign(Object.assign({}, payload), { t: type }), secret, { expiresIn });
     }
-    verify(jwtToken) {
+    verify(jwtToken, mustHaveType) {
         return __awaiter(this, void 0, void 0, function* () {
             // read ADMINFORH_SECRET from environment if not drop error
             const secret = process.env.ADMINFORTH_SECRET;
@@ -61,7 +68,10 @@ class AdminForthAuth {
                 }
                 return null;
             }
-            const { pk } = decoded;
+            const { pk, t } = decoded;
+            if (t !== mustHaveType) {
+                throw new Error(`Invalid token type during verification: ${t}, must be ${mustHaveType}`);
+            }
             if (pk === null) {
                 decoded.isRoot = true;
             }

package/dist/dataConnectors/mongo.js

@@ -71,15 +71,7 @@ class MongoConnector {
             if (!value) {
                 return null;
             }
-            if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-                return dayjs.unix(+value).toISOString();
-            }
-            else if (field._underlineType == 'varchar') {
-                return dayjs.unix(+value).toISOString();
-            }
-            else {
-                throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
-            }
+            return dayjs.unix(value).toISOString();
         }
         else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {

package/dist/index.js

@@ -541,7 +541,7 @@ class AdminForth {
                 const { username, password } = body;
                 let token;
                 if (username === this.config.rootUser.username && password === this.config.rootUser.password) {
-                    token = this.auth.issueJWT({ username, pk: null });
+                    this.auth.setAuthCookie({ response, username, pk: null });
                 }
                 else {
                     // get resource from db
@@ -575,15 +575,12 @@ class AdminForth {
                     console.log('User record', userRecord, passwordHash); // why does it has no hash?
                     const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);
                     if (valid) {
-                        token = this.auth.issueJWT({
-                            username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name]
-                        });
+                        this.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
                     }
                     else {
                         return { error: INVALID_MESSAGE };
                     }
                 }
-                response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
                 return { ok: true };
             }),
         });
@@ -599,7 +596,7 @@ class AdminForth {
             method: 'POST',
             path: '/logout',
             handler: (_e) => __awaiter(this, [_e], void 0, function* ({ response }) {
-                response.setHeader('Set-Cookie', `adminforth_jwt=; Path=${this.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
+                this.auth.removeAuthCookie({ response });
                 return { ok: true };
             }),
         });
@@ -633,11 +630,9 @@ class AdminForth {
                 let userFullName = '';
                 if (adminUser.isRoot) {
                     username = this.config.rootUser.username;
-                    console.log(username, 'this is the root');
                 }
                 else {
                     const dbUser = adminUser.dbUser;
-                    console.log(dbUser, 'this is the db user', adminUser, 'this is the admin user');
                     username = dbUser[this.config.auth.usernameField];
                     userFullName = dbUser[this.config.auth.userFullNameField];
                 }
@@ -1031,7 +1026,7 @@ class AdminForth {
                 }
                 // execute hook if needed
                 for (const hook of listify((_3 = (_2 = resource.hooks) === null || _2 === void 0 ? void 0 : _2.edit) === null || _3 === void 0 ? void 0 : _3.afterSave)) {
-                    const resp = yield hook({ resource, record, adminUser });
+                    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' } `);
                     }

package/dist/plugins/AuditLogPlugin/custom/AuditLogView.vue

@@ -2,19 +2,20 @@
 import VueDiff from 'vue-diff';
 import { ref } from 'vue';
 import 'vue-diff/dist/index.css';
-
-const props = defineProps(['prev', 'current', 'meta']);
+import { app } from '@/main';
 
 app.use(VueDiff);
+
+const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser']);
 </script>
 
 <template>
     <Diff
       :mode="'split'"
       :theme="'light'"
-      :language="'plaintext'"
-      :prev="props.prev"
-      :current="props.current"
+      :language="'JSON'"
+      :prev="JSON.stringify(JSON.parse(props.record[props.meta.resourceColumns.resourceDataColumnName]).oldRecord, null, 2)"
+      :current="JSON.stringify(JSON.parse(props.record[props.meta.resourceColumns.resourceDataColumnName]).newRecord, null, 2)"
     />
-  </template>
+</template>
   

package/dist/plugins/AuditLogPlugin/index.js

@@ -11,20 +11,25 @@ import AdminForthPlugin from "../base.js";
 class AuditLogPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
-        this.createLogRecord = (resource, action, data, user) => __awaiter(this, void 0, void 0, function* () {
+        this.createLogRecord = (resource, action, data, user, oldRecord) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const recordIdFieldName = (_a = resource.columns.find((c) => c.primaryKey === true)) === null || _a === void 0 ? void 0 : _a.name;
-            const recordId = data[recordIdFieldName];
+            const recordId = (data === null || data === void 0 ? void 0 : data[recordIdFieldName]) || (oldRecord === null || oldRecord === void 0 ? void 0 : oldRecord[recordIdFieldName]);
+            const connector = this.adminforth.connectors[resource.dataSource];
+            const newRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
+            let newData = {
+                'oldRecord': oldRecord || {},
+                'newRecord': newRecord
+            };
             const record = {
                 [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
                 [this.options.resourceColumns.resourceActionColumnName]: action,
-                [this.options.resourceColumns.resourceDataColumnName]: data,
+                [this.options.resourceColumns.resourceDataColumnName]: newData,
                 [this.options.resourceColumns.resourceUserIdColumnName]: user.pk,
                 [this.options.resourceColumns.resourceRecordIdColumnName]: recordId,
                 [this.options.resourceColumns.resourceCreatedColumnName]: new Date()
             };
             const auditLogResource = this.adminforth.config.resources.find((r) => r.resourceId === this.auditLogResource);
-            console.log('rec', record);
             yield this.adminforth.createResourceRecord({ resource: auditLogResource, record, adminUser: user });
             return { ok: true };
         });
@@ -49,18 +54,17 @@ class AuditLogPlugin extends AdminForthPlugin {
                     };
                 }
                 diffColumn.components = {
-                    showRow: {
+                    show: {
                         file: this.componentPath('AuditLogView.vue'),
                         meta: Object.assign(Object.assign({}, this.options), { pluginInstanceId: this.pluginInstanceId })
                     }
                 };
-                resource.columns.push(diffColumn);
                 return;
             }
             const defaultHooks = {
-                create: { beforeSave: [] },
-                edit: { beforeSave: [] },
-                delete: { beforeSave: [] }
+                create: { afterSave: [] },
+                edit: { afterSave: [] },
+                delete: { afterSave: [] }
             };
             if (!resource.hooks) {
                 resource.hooks = defaultHooks;
@@ -69,11 +73,11 @@ class AuditLogPlugin extends AdminForthPlugin {
                 resource.hooks = Object.assign(Object.assign({}, defaultHooks), resource.hooks);
             }
             Object.keys(resource.hooks).forEach((hook) => {
-                if (!Array.isArray(resource.hooks[hook].beforeSave)) {
-                    resource.hooks[hook].beforeSave = [resource.hooks[hook].beforeSave];
+                if (!Array.isArray(resource.hooks[hook].afterSave)) {
+                    resource.hooks[hook].afterSave = [resource.hooks[hook].afterSave];
                 }
-                resource.hooks[hook].beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser }) {
-                    return yield this.createLogRecord(resource, hook, record, adminUser);
+                resource.hooks[hook].afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
+                    return yield this.createLogRecord(resource, hook, record, adminUser, oldRecord);
                 }));
             });
         });

package/dist/servers/express.js

@@ -149,7 +149,7 @@ class ExpressServer {
                 res.status(401).send('Unauthorized by AdminForth');
                 return;
             }
-            const adminforthUser = yield this.adminforth.auth.verify(jwt);
+            const adminforthUser = yield this.adminforth.auth.verify(jwt, 'auth');
             if (!adminforthUser) {
                 res.status(401).send('Unauthorized by AdminForth');
             }

package/dist/spa/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
+    <link rel="icon" href="/* IMPORTANT:ADMINFORTH FAVICON */">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>/* IMPORTANT:ADMINFORTH TITLE */</title>
 <!--     
     <script>
       // On page load or when changing themes, best to add inline in `head` to avoid FOUC

package/dist/spa/package-lock.json

@@ -17,6 +17,7 @@
         "flowbite-datepicker": "^1.2.6",
         "pinia": "^2.1.7",
         "unhead": "^1.9.12",
+        "uuid": "^10.0.0",
         "vue": "^3.4.21",
         "vue-router": "^4.3.0",
         "vue-slider-component": "^4.1.0-beta.7"
@@ -36,7 +37,7 @@
         "sass": "^1.77.2",
         "tailwindcss": "^3.4.3",
         "typescript": "~5.4.0",
-        "vite": "^5.2.12",
+        "vite": "^5.2.13",
         "vue-tsc": "^2.0.11"
       }
     },
@@ -4032,10 +4033,22 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
+    "node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vite": {
-      "version": "5.2.12",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
-      "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+      "version": "5.2.13",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz",
+      "integrity": "sha512-SSq1noJfY9pR3I1TUENL3rQYDQCFqgD+lM6fTRAM8Nv6Lsg5hDLaXkjETVeBt+7vZBCMoibD+6IWnT2mJ+Zb/A==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.20.1",

package/dist/spa/package.json

@@ -21,6 +21,7 @@
     "flowbite-datepicker": "^1.2.6",
     "pinia": "^2.1.7",
     "unhead": "^1.9.12",
+    "uuid": "^10.0.0",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0",
     "vue-slider-component": "^4.1.0-beta.7"
@@ -40,7 +41,7 @@
     "sass": "^1.77.2",
     "tailwindcss": "^3.4.3",
     "typescript": "~5.4.0",
-    "vite": "^5.2.12",
+    "vite": "^5.2.13",
     "vue-tsc": "^2.0.11"
   }
 }

package/dist/spa/spa/src/App.vue

@@ -163,7 +163,7 @@
 </style>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch, defineComponent } from 'vue';
+import { computed, onMounted, ref, watch, defineComponent, onBeforeMount } from 'vue';
 import { RouterLink, RouterView } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 import './index.scss'
@@ -211,6 +211,8 @@ const theme = ref('light');
 function toggleTheme() {
   theme.value = theme.value === 'light' ? 'dark' : 'light';
   document.documentElement.classList.toggle('dark');
+  window.localStorage.setItem('theme', theme.value);
+
 }
 
 function clickOnMenuItem (label: string) {
@@ -237,14 +239,8 @@ async function initRouter() {
 }
 
 async function loadMenu() {
-  await coreStore.fetchMenuAndResource()
+  await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
-  
-  coreStore.menu.forEach((item, i) => {
-    if (item.open) {
-      opened.value.push(i);
-    }
-  });
 }
 
 
@@ -256,16 +252,32 @@ watch(route, () => {
   })
 });
 
+watch (()=>coreStore.menu, () => {
+    coreStore.menu.forEach((item, i) => {
+    if (item.open) {
+      opened.value.push(i);
+    };
+  });
+})
+
+watch([loggedIn,  routerIsReady, loginRedirectCheckIsReady], ([l,r,lr]) => {
+  if (l && r && lr) {
+    setTimeout(() => {
+    initFlowbite();
+  }); 
+  }
+})
+
 // initialize components based on data attribute selectors
 onMounted(async () => {
   loadMenu(); // run this in async mode
   // before init flowbite we have to wait router initialized because it affects dom(our v-ifs) and fetch menu
   await initRouter()
-  setTimeout(() => {
-    initFlowbite();
-  }); 
-
+})
 
+onBeforeMount(()=>{
+  theme.value = window.localStorage.getItem('theme') || 'light';
+  document.documentElement.classList.toggle('dark', theme.value === 'dark');
 })
 
 </script>

package/dist/spa/spa/src/composables/useStores.ts

@@ -1,4 +1,5 @@
-import type { FrontendAPIInterface, ConfirmParams, AlertParams, FilterParams,Operator } from '../types/FrontendAPI';
+import type { FrontendAPIInterface, ConfirmParams, AlertParams, } from '../types/FrontendAPI';
+import type { AdminForthFilterOperators } from '@/types/AdminForthConfig';
 import { useToastStore } from '../stores/toast';
 import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
@@ -6,9 +7,20 @@ import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
 import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
-
-
-
+ type FilterParams = {
+  /**
+   * Field of resource to filter
+   */
+  field: string;
+  /**
+   * Operator of filter
+   */
+  operator: AdminForthFilterOperators;
+  /**
+   * Value of filter
+   */
+  value: string | number | boolean ;
+}
 
 declare global {
   interface Window {

package/dist/spa/spa/src/main.ts

@@ -6,7 +6,7 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 
-const app = createApp(App)
+export const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */