adminforth 1.1.66 → 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/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/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 };
             }),
         });

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

@@ -14,8 +14,8 @@ const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser'])
       :mode="'split'"
       :theme="'light'"
       :language="'JSON'"
-      :prev="props.record[props.meta.resourceColumns.resourceDataColumnName].oldRecord"
-      :current="props.record[props.meta.resourceColumns.resourceDataColumnName].newRecord"
+      :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>
   

package/dist/plugins/AuditLogPlugin/index.js

@@ -21,7 +21,6 @@ class AuditLogPlugin extends AdminForthPlugin {
                 'oldRecord': oldRecord || {},
                 'newRecord': newRecord
             };
-            // console.log('newData', newData)
             const record = {
                 [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
                 [this.options.resourceColumns.resourceActionColumnName]: action,

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/index.ts

@@ -626,7 +626,7 @@ class AdminForth implements AdminForthClass {
         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
           if (!this.config.auth) {
@@ -664,15 +664,11 @@ class AdminForth implements AdminForthClass {
           console.log('User record', userRecord, passwordHash)  // why does it has no hash?
           const valid = await 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 };
       },
     });
@@ -690,7 +686,7 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/logout',
         handler: async ({ 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 };
         },
     })

package/package.json

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

package/plugins/AuditLogPlugin/custom/AuditLogView.vue

@@ -14,8 +14,8 @@ const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser'])
       :mode="'split'"
       :theme="'light'"
       :language="'JSON'"
-      :prev="props.record[props.meta.resourceColumns.resourceDataColumnName].oldRecord"
-      :current="props.record[props.meta.resourceColumns.resourceDataColumnName].newRecord"
+      :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>
   

package/plugins/AuditLogPlugin/index.ts

@@ -36,7 +36,6 @@ export default class AuditLogPlugin extends AdminForthPlugin {
         'oldRecord': oldRecord || {},
         'newRecord': newRecord
     }
-    // console.log('newData', newData)
     const record = {
       [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
       [this.options.resourceColumns.resourceActionColumnName]: action,

package/servers/express.ts

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

package/types/AdminForthConfig.ts

@@ -101,8 +101,9 @@ export interface AdminForthClass {
   createResourceRecord(params: { resource: AdminForthResource, record: any, adminUser: AdminUser }): Promise<any>;
 
   auth: {
+    verify(jwt : string, mustHaveType: string): Promise<any>;
 
-    verify(jwt : string): Promise<any>;
+    issueJWT(payload: Object, type: string): string;
   }
 
   /**