adminforth 1.3.25 → 1.3.27

package/auth.ts

@@ -1,6 +1,5 @@
 
 import jwt from 'jsonwebtoken';
-
 import crypto from 'crypto';
 import AdminForth from './index.js';
 
@@ -19,6 +18,23 @@ function generateSalt(length = 16) {
   return crypto.randomBytes(length).toString('hex');
 }
 
+function parseTimeToSeconds(time: string): number {
+  const unit = time.slice(-1);
+  const value = parseInt(time.slice(0, -1), 10);
+  switch (unit) {
+    case 's':
+      return value;
+    case 'm':
+      return value * 60;
+    case 'h':
+      return value * 60 * 60;
+    case 'd':
+      return value * 60 * 60 * 24;
+    default:
+      throw new Error(`Invalid time unit: ${unit}`);
+  }
+}
+
 class AdminForthAuth {
   adminforth: AdminForth;
 
@@ -37,13 +53,17 @@ class AdminForthAuth {
     pk: string | null
   }) {
     const expiresIn: string = expireInDays ? `${expireInDays}d` : (process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h');
+    // might be h,m,d in string
+    const expiresInSec = parseTimeToSeconds(expiresIn);
 
     const token = this.issueJWT({ username, pk}, 'auth', expiresIn);
-    response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+    const expiresCookieFormat = new Date(Date.now() + expiresInSec * 1000).toUTCString();
+    
+    response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${expiresCookieFormat}`);
   }
 
   removeCustomCookie({response, name}) {
-    response.setHeader('Set-Cookie', `adminforth_test'='2'; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+    response.setHeader('Set-Cookie', `adminforth_${name}=; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
   }
 
   setCustomCookie({ response, payload }: {

package/dist/auth.js

@@ -23,6 +23,22 @@ function calcPasswordHash(password, salt, iterations = 100000, keyLength = 64, d
 function generateSalt(length = 16) {
     return crypto.randomBytes(length).toString('hex');
 }
+function parseTimeToSeconds(time) {
+    const unit = time.slice(-1);
+    const value = parseInt(time.slice(0, -1), 10);
+    switch (unit) {
+        case 's':
+            return value;
+        case 'm':
+            return value * 60;
+        case 'h':
+            return value * 60 * 60;
+        case 'd':
+            return value * 60 * 60 * 24;
+        default:
+            throw new Error(`Invalid time unit: ${unit}`);
+    }
+}
 class AdminForthAuth {
     constructor(adminforth) {
         this.adminforth = adminforth;
@@ -32,11 +48,14 @@ class AdminForthAuth {
     }
     setAuthCookie({ expireInDays, response, username, pk }) {
         const expiresIn = expireInDays ? `${expireInDays}d` : (process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h');
+        // might be h,m,d in string
+        const expiresInSec = parseTimeToSeconds(expiresIn);
         const token = this.issueJWT({ username, pk }, 'auth', expiresIn);
-        response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+        const expiresCookieFormat = new Date(Date.now() + expiresInSec * 1000).toUTCString();
+        response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${expiresCookieFormat}`);
     }
     removeCustomCookie({ response, name }) {
-        response.setHeader('Set-Cookie', `adminforth_test'='2'; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
+        response.setHeader('Set-Cookie', `adminforth_${name}=; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
     }
     setCustomCookie({ response, payload }) {
         const { name, value, expiry, httpOnly } = payload;

package/modules/operationalResource.ts

@@ -1,5 +1,4 @@
-import { error } from 'console';
-import { IAdminForthFilter, IAdminForthSort, IOperationalResource, IAdminForthDataSourceConnectorBase, AdminForthResource, IAdminForth } from '../types/AdminForthConfig.js';
+import { IAdminForthFilter, IAdminForthSort, IOperationalResource, IAdminForthDataSourceConnectorBase, AdminForthResource } from '../types/AdminForthConfig.js';
 
 
 function filtersIfFilter(filter: IAdminForthFilter | IAdminForthFilter[] | undefined): IAdminForthFilter[] {

package/modules/restApi.ts

@@ -362,8 +362,6 @@ export default class AdminForthRestAPI {
         }
         const { limit, offset, filters, sort } = body;
 
-        
-
         for (const filter of (filters || [])) {
           if (!Object.values(AdminForthFilterOperators).includes(filter.operator)) {
               throw new Error(`Operator '${filter.operator}' is not allowed`);

package/package.json

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

package/spa/src/components/Toast.vue

@@ -1,7 +1,7 @@
 <template>
     
 
-<div id="toast-default" class="flex  items-center w-full p-4 text-gray-500 rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
+<div class="flex items-center w-full p-4 text-gray-500 rounded-lg shadow-lg dark:text-gray-400 dark:bg-gray-800 bg-white"
     role="alert"
     :class="
         {

package/spa/src/views/EditView.vue

@@ -156,6 +156,13 @@ async function saveRecord() {
   });
   if (resp.error) {
     showErrorTost(resp.error);
+  } else {
+    window.adminforth.alert({
+      message: 'Record updated successfully',
+      variant: 'success',
+      timeout: 400000
+
+    });
   }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });

package/spa/src/views/ShowView.vue

@@ -78,7 +78,7 @@
                 <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
                   {{ column.label }}
                 </td>
-                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
+                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap" :data-af-column="column.name">
                   <component
                     v-if="column?.components?.show"
                     :is="getCustomComponent(column?.components?.show)"

package/types/AdminForthConfig.ts

@@ -1,5 +1,4 @@
 import type { Express } from 'express';
-import OperationalResource from '../modules/operationalResource.js';
 
 export interface ICodeInjector {
   srcFoldersToSync: Object;