adminforth 1.3.21 → 1.3.23

package/auth.ts

@@ -30,10 +30,15 @@ class AdminForthAuth {
     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
+  setAuthCookie({ expireInDays, response, username, pk}: {
+    expireInDays?: number,
+    response: any, 
+    username: string, 
+    pk: string | null
   }) {
-    const token = this.issueJWT({ username, pk, }, 'auth');
+    const expiresIn: string = expireInDays ? `${expireInDays}d` : (process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h');
+
+    const token = this.issueJWT({ username, pk}, 'auth', expiresIn);
     response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
   }
 
@@ -47,11 +52,8 @@ class AdminForthAuth {
     const {name,value,expiry,httpOnly} = payload
     response.setHeader('Set-Cookie', `adminforth_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + expiry).toUTCString() } `);
   }
-
  
-
-
-  issueJWT(payload: Object, type: string) {
+  issueJWT(payload: Object, type: string, expiresIn: string = '24h'): string {
     // read ADMINFORH_SECRET from environment if not drop error
     const secret = process.env.ADMINFORTH_SECRET;
     if (!secret) {
@@ -59,7 +61,6 @@ class AdminForthAuth {
     }
 
     // issue JWT token
-    const expiresIn = process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h';
     return jwt.sign({...payload, t: type}, secret, { expiresIn });
   }
 

package/dist/auth.js

@@ -30,8 +30,9 @@ class AdminForthAuth {
     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');
+    setAuthCookie({ expireInDays, response, username, pk }) {
+        const expiresIn = expireInDays ? `${expireInDays}d` : (process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h');
+        const token = this.issueJWT({ username, pk }, 'auth', expiresIn);
         response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
     }
     removeCustomCookie({ response, name }) {
@@ -41,14 +42,13 @@ class AdminForthAuth {
         const { name, value, expiry, httpOnly } = payload;
         response.setHeader('Set-Cookie', `adminforth_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + expiry).toUTCString()} `);
     }
-    issueJWT(payload, type) {
+    issueJWT(payload, type, expiresIn = '24h') {
         // read ADMINFORH_SECRET from environment if not drop error
         const secret = process.env.ADMINFORTH_SECRET;
         if (!secret) {
             throw new Error('ADMINFORTH_SECRET environment not set');
         }
         // issue JWT token
-        const expiresIn = process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h';
         return jwt.sign(Object.assign(Object.assign({}, payload), { t: type }), secret, { expiresIn });
     }
     verify(jwtToken_1, mustHaveType_1) {

package/dist/modules/configValidator.js

@@ -251,6 +251,7 @@ export default class ConfigValidator {
                         label: `Delete checked`,
                         state: 'danger',
                         icon: 'flowbite:trash-bin-outline',
+                        confirm: 'Are you sure you want to delete selected items?',
                         allowed: (_b) => __awaiter(this, [_b], void 0, function* ({ resource, adminUser, allowedActions }) { return allowedActions.delete; }),
                         action: (_c) => __awaiter(this, [_c], void 0, function* ({ selectedIds, adminUser }) {
                             const connector = this.adminforth.connectors[res.dataSource];
@@ -286,7 +287,7 @@ export default class ConfigValidator {
                             if (error) {
                                 return { error, ok: false };
                             }
-                            return { ok: true };
+                            return { ok: true, successMessage: `${selectedIds.length} item${selectedIds.length > 1 ? 's' : ''} deleted` };
                         })
                     });
                 }

package/dist/modules/restApi.js

@@ -43,8 +43,8 @@ export default class AdminForthRestAPI {
             path: '/login',
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
                 var _b, _c, _d, _e;
-                const INVALID_MESSAGE = 'Invalid username or password';
-                const { username, password } = body;
+                const INVALID_MESSAGE = 'Invalid Username or Password';
+                const { username, password, rememberMe } = body;
                 let adminUser;
                 let toReturn = { ok: true, allowedLogin: true };
                 // get resource from db
@@ -71,9 +71,8 @@ export default class AdminForthRestAPI {
                     offset: 0,
                     sort: [],
                 })).data) === null || _b === void 0 ? void 0 : _b[0];
-                console.log('userRecord', userRecord, this.adminforth.config.auth.usernameField, username);
                 if (!userRecord) {
-                    return { error: 'User not found' };
+                    return { error: INVALID_MESSAGE };
                 }
                 const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
                 const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);
@@ -94,7 +93,13 @@ export default class AdminForthRestAPI {
                         }
                     }
                     if (toReturn.allowedLogin) {
-                        this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
+                        const expireInDays = rememberMe && this.adminforth.config.auth.rememberMeDays;
+                        this.adminforth.auth.setAuthCookie({
+                            expireInDays,
+                            response,
+                            username,
+                            pk: userRecord[userResource.columns.find((col) => col.primaryKey).name]
+                        });
                     }
                 }
                 else {
@@ -141,6 +146,7 @@ export default class AdminForthRestAPI {
                     demoCredentials: this.adminforth.config.auth.demoCredentials,
                     loginPromptHTML: this.adminforth.config.auth.loginPromptHTML,
                     loginPageInjections: this.adminforth.config.customization.loginPageInjections,
+                    rememberMeDays: this.adminforth.config.auth.rememberMeDays,
                 };
             }),
         });

package/modules/configValidator.ts

@@ -6,6 +6,7 @@ import {
   AdminForthResourcePages, AllowedActionsEnum,
   type AdminForthComponentDeclarationFull,
   type AfterSaveFunction,
+  AdminForthBulkAction,
 } from "../types/AdminForthConfig.js";
 
 import fs from 'fs';
@@ -260,7 +261,7 @@ export default class ConfigValidator implements IConfigValidator {
 
 
         //check if resource has bulkActions
-        let bulkActions = res?.options?.bulkActions || [];
+        let bulkActions: AdminForthBulkAction[] = res?.options?.bulkActions || [];
 
         if (!Array.isArray(bulkActions)) {
           errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
@@ -272,6 +273,7 @@ export default class ConfigValidator implements IConfigValidator {
             label: `Delete checked`,
             state: 'danger',
             icon: 'flowbite:trash-bin-outline',
+            confirm: 'Are you sure you want to delete selected items?',
             allowed: async ({ resource, adminUser, allowedActions }) => { return allowedActions.delete },
             action: async ({ selectedIds, adminUser }) => {
               const connector = this.adminforth.connectors[res.dataSource];
@@ -324,7 +326,7 @@ export default class ConfigValidator implements IConfigValidator {
               if (error) {
                 return { error, ok: false };
               }
-              return { ok: true };
+              return { ok: true, successMessage: `${selectedIds.length} item${selectedIds.length > 1 ? 's' : ''} deleted` };
             }
           });
         }

package/modules/restApi.ts

@@ -62,8 +62,8 @@ export default class AdminForthRestAPI {
       path: '/login',
       handler: async ({ body, response }) => {
        
-        const INVALID_MESSAGE = 'Invalid username or password';
-        const { username, password } = body;
+        const INVALID_MESSAGE = 'Invalid Username or Password';
+        const { username, password, rememberMe } = body;
         let adminUser: AdminUser;
         let toReturn: { ok: boolean, redirectTo?: string, allowedLogin:boolean } = { ok: true, allowedLogin:true};
 
@@ -95,10 +95,9 @@ export default class AdminForthRestAPI {
           })
         ).data?.[0];
 
-        console.log('userRecord', userRecord, this.adminforth.config.auth.usernameField, username);
 
         if (!userRecord) {
-          return { error: 'User not found' };
+          return { error: INVALID_MESSAGE };
         }
 
         const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
@@ -121,7 +120,13 @@ export default class AdminForthRestAPI {
             }
           }
           if (toReturn.allowedLogin){
-            this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
+            const expireInDays = rememberMe && this.adminforth.config.auth.rememberMeDays;
+            this.adminforth.auth.setAuthCookie({ 
+              expireInDays,
+              response, 
+              username, 
+              pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] 
+            });
           } 
         } else {
           return { error: INVALID_MESSAGE };
@@ -173,6 +178,7 @@ export default class AdminForthRestAPI {
           demoCredentials: this.adminforth.config.auth.demoCredentials,
           loginPromptHTML: this.adminforth.config.auth.loginPromptHTML,
           loginPageInjections: this.adminforth.config.customization.loginPageInjections,
+          rememberMeDays: this.adminforth.config.auth.rememberMeDays,
         };
       },
     });

package/package.json

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

package/spa/src/composables/useFrontendApi.ts

@@ -9,7 +9,7 @@ export function showWarningTost(message: string) {
 }
 
 export function showErrorTost(message: string, timeout?: number) {
-  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
+  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 30});  
   return message;
 }
 

package/spa/src/composables/useStores.ts

@@ -57,7 +57,11 @@ export class FrontendAPI implements FrontendAPIInterface {
 
   confirm(params: ConfirmParams): Promise<void> {
     return new Promise((resolve, reject) => {
-      this.modalStore.setModalContent({ content: params.message, acceptText: params.yes, cancelText: params.no })
+      this.modalStore.setModalContent({ 
+        content: params.message, 
+        acceptText: params.yes || 'Yes',
+        cancelText: params.no || 'Cancel' 
+      })
       this.modalStore.onAcceptFunction = resolve
       this.modalStore.onCancelFunction = reject
       this.modalStore.togleModal()

package/spa/src/stores/core.ts

@@ -71,7 +71,7 @@ export const useCoreStore = defineStore('core', () => {
       window.adminforth.alert({
         message: respData.error,
         variant: 'danger',
-        timeout: 'unlimited'
+        timeout: 30,
       });
       record.value = {};
     } else {

package/spa/src/stores/toast.ts

@@ -1,14 +1,30 @@
-import { ref, computed } from 'vue'
+import { ref, watch, type Ref } from 'vue'
 import { defineStore } from 'pinia'
-import { callAdminForthApi } from '@/utils';
 import { v1 as uuid } from 'uuid';
+import { useRoute } from 'vue-router';
+
+
 
 export const useToastStore = defineStore('toast', () => {
-    const toasts = ref([]);
-    const addToast = (toast) => {
-        toasts.value.push({...toast, id: uuid()});
+    const toasts: Ref<any[]> = ref([]);
+    const route = useRoute();
+
+    watch(route, () => {
+        console.log('route changed 121');
+        // on route change clear all toasts older then 5 seconds
+        const now = +new Date();
+        toasts.value = toasts.value.filter((t) => now - t.createdAt < 5000);
+    });
+
+    const addToast = (toast: { message: string; variant: string }) => {
+        const toastId = uuid();
+        toasts.value.push({
+            ...toast,
+            id: toastId,
+            createdAt: +new Date(),
+        });
     };
-    const removeToast = (toast) => {
+    const removeToast = (toast: { id: string }) => {
         toasts.value = toasts.value.filter((t) => t.id !== toast.id);
     };
     return { toasts, addToast, removeToast };

package/spa/src/views/CreateView.vue

@@ -149,6 +149,10 @@ async function saveRecord() {
         primaryKey: response.newRecordId
       } 
     });
+    window.adminforth.alert({
+      message: 'Record created successfully',
+      variant: 'success'
+    });
   }
 }
 

package/spa/src/views/ListView.vue

@@ -179,6 +179,16 @@ async function getList() {
 }
 
 async function startBulkAction(actionId) {
+  const action = coreStore.resource.options.bulkActions.find(a => a.id === actionId);
+  if (action.confirm) {
+    const confirmed = await window.adminforth.confirm({
+      message: action.confirm,
+    });
+    if (!confirmed) {
+      return;
+    }
+  }
+
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
     method: 'POST',
@@ -192,6 +202,14 @@ async function startBulkAction(actionId) {
   if (data?.ok) {
     checkboxes.value = [];
     await getList();
+
+    if (data.successMessage) {
+      window.adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+
   }
   if (data?.error) {
     showErrorTost(data.error);

package/spa/src/views/LoginView.vue

@@ -56,9 +56,16 @@
                             </button>
                         </div>
 
-                        <div class="flex items-start mb-5 hidden">
+                        <div v-if="coreStore.config.rememberMeDays" 
+                            class="flex items-start mb-5"
+                            :title="`Stay logged in for ${coreStore.config.rememberMeDays} days`"
+                        >
                           <div class="flex items-center h-5">
-                            <input id="remember" type="checkbox" value="" class="w-4 h-4 border border-gray-300 rounded bg-gray-50 focus:ring-3 focus:ring-blue-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800" required />
+                            <input id="remember" 
+                              ref="rememberInput"
+                              type="checkbox" 
+                              value="" 
+                              class="w-4 h-4 border border-gray-300 rounded bg-gray-50 focus:ring-3 focus:ring-blue-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800" />
                           </div>
                           <label for="remember" class="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">Remember me</label>
                         </div>
@@ -125,6 +132,7 @@ import { useRouter } from 'vue-router';
 
 const passwordInput = ref(null);
 const usernameInput = ref(null);
+const rememberInput = ref(null);
 
 const router = useRouter();
 const inProgress = ref(false);
@@ -166,6 +174,7 @@ async function login() {
     body: {
       username,
       password,
+      rememberMe: rememberInput.value.checked,
     }
   });
   inProgress.value = false;

package/types/AdminForthConfig.ts

@@ -239,11 +239,11 @@ export interface IAdminForthDataSourceConnectorConstructor {
 
 export interface IAdminForthAuth {
   verify(jwt : string, mustHaveType: string, decodeUser?: boolean): Promise<any>;
-  issueJWT(payload: Object, type: string): string;
+  issueJWT(payload: Object, type: string, expiresIn?: string): string;
 
   removeCustomCookie({response, name}: {response: any, name: string}): void;
 
-  setAuthCookie({response, username, pk,}: {response: any, username: string, pk: string}): void;
+  setAuthCookie({expireInDays, response, username, pk,}: {expireInDays?: number, response: any, username: string, pk: string}): void;
   
   removeAuthCookie(response: any): void;
 }
@@ -744,13 +744,17 @@ export type AdminForthBulkAction = {
    * Callback which will be called on backend when user clicks on action button.
    * It should return Promise which will be resolved when action is done.
    */
-  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string }>,
+  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string, successMessage?: string }>,
 
   /**
    * Confirmation message which will be displayed to user before action is executed.
    */
   confirm?: string,
 
+  /**
+   * Success message which will be displayed to user after action is executed.
+   */
+  successMessage?: string,
   /**
    * Allowed callback called to check whether action is allowed for user.
    * 1. It called first time when user goes to list view. If callback returns false, action button will be hidden on list view.
@@ -1174,6 +1178,13 @@ export type AdminForthConfig = {
        * Any prompt to show users on login. Supports HTML.
        */
       loginPromptHTML?: string,
+
+      /**
+       * Remember me days for "Remember Me" checkbox on login page.
+       * If not set or set to null/0/undefined, "Remember Me" checkbox will not be displayed.
+       * If rememberMeDays is set, then users who check "Remember Me" will be staying logged in for this amount of days.
+       */
+      rememberMeDays?: number,
     },
      /**
       * Array of resources which will be displayed in the admin panel.