adminforth 1.1.12 → 1.1.14

package/dist/plugins/ForeignInlineListPlugin/index.js

@@ -24,7 +24,7 @@ export default class ForeignInlineListPlugin extends AdminForthPlugin {
                     return { error: `Resource ${this.options.foreignResourceId} not found` };
                 }
                 // exclude "plugins" key
-                const resourceCopy = Object.assign(Object.assign({}, resource), { plugins: undefined });
+                const resourceCopy = JSON.parse(JSON.stringify(Object.assign(Object.assign({}, resource), { plugins: undefined })));
                 if (this.options.modifyTableResourceConfig) {
                     this.options.modifyTableResourceConfig(resourceCopy);
                 }

package/dist/servers/express.js

@@ -149,7 +149,7 @@ class ExpressServer {
                 res.status(401).send('Unauthorized by AdminForth');
                 return;
             }
-            const adminforthUser = this.adminforth.auth.verify(jwt);
+            const adminforthUser = yield this.adminforth.auth.verify(jwt);
             if (!adminforthUser) {
                 res.status(401).send('Unauthorized by AdminForth');
             }
@@ -191,7 +191,7 @@ class ExpressServer {
                     this.message = message;
                 }
             };
-            const input = { body, query, headers, cookies, response, _raw_express_req: req, _raw_express_res: res };
+            const input = { body, query, headers, cookies, adminUser, response, _raw_express_req: req, _raw_express_res: res };
             let output;
             try {
                 output = yield handler(input);

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

@@ -64,7 +64,6 @@
     aria-label="Sidebar"
   >
     <div class="h-full px-3 pb-4 overflow-y-auto bg-nav-menu-bg dark:bg-gray-800 border-r">
-
       <div class="flex ms-2 md:me-24  m-4  ">
         <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="h-8 me-3"  />
         <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
@@ -168,6 +167,7 @@ import { RouterLink, RouterView } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 import './index.scss'
 import { useCoreStore } from '@/stores/core';
+import { useUserStore } from '@/stores/user';
 import {useModalStore} from '@/stores/modal';
 import { IconMoonSolid, IconSunSolid } from '@iconify-prerendered/vue-flowbite';
 import AcceptModal from './components/AcceptModal.vue';
@@ -184,6 +184,7 @@ import { FrontendAPI } from '@/composables/useStores'
 const coreStore = useCoreStore();
 const modalStore = useModalStore();
 const toastStore = useToastStore();
+const userStore = useUserStore();
 const frontendApi = new FrontendAPI();
 frontendApi.init();
 const splitAtLast = (str: string, separator: string) => {
@@ -221,8 +222,9 @@ if (opened.value.includes(label)) {
 }
 
 async function logout() {
-  await coreStore.logout();
-  router.push({ name: 'login' });
+  userStore.unauthorize();
+  await userStore.logout();
+  router.push({ name: 'login' })
 }
 
 
@@ -244,6 +246,8 @@ async function loadMenu() {
   });
 }
 
+
+
 watch(route, () => {
   title.value = `${coreStore.config?.title || coreStore.config?.brandName || 'Adminforth'} | ${ Object.values(route.params)[0] || route.meta.title || ' '}`;
   useHead({

package/dist/spa/spa/src/components/Toast.vue

@@ -46,16 +46,17 @@ const props = defineProps<{
     toast:{message: string;
     variant: string;
     id: string;
-    duration?: number;}
+    timeout?: number|'unlimited';}
 }>();
 function closeToast() {
     emit('close');
 }
 
 onMounted(() => {
-    setTimeout(() => {
-     emit('close');   
-    }, props.toast.duration  || 5000 );
+    if (props.toast.timeout === 'unlimited') return;
+    else { 
+      setTimeout(() => {emit('close');}, props.toast.timeout  || 10000 );
+    }
 });
 
 </script>

package/dist/spa/spa/src/components/ValueRenderer.vue

@@ -41,7 +41,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useCoreStore } from '@/stores/core';
 
 const coreStore = useCoreStore();
-const  route = useRoute();
+const route = useRoute();
 
 
 dayjs.extend(utc);

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

@@ -56,7 +56,8 @@ export class FrontendAPI implements FrontendAPIInterface {
   alert(params: AlertParams): void {
     this.toastStore.addToast({
       message: params.message,
-      variant: params.variant
+      variant: params.variant,
+      timeout: params.timeout  
     })
   }
 

package/dist/spa/spa/src/router/index.ts

@@ -1,5 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import ResourceParent from '@/views/ResourceParent.vue'
+import { useUserStore } from '@/stores/user'
 /* IMPORTANT:ADMINFORTH ROUTES IMPORTS */
 
 const router = createRouter({
@@ -9,7 +10,15 @@ const router = createRouter({
       path: '/login',
       name: 'login',
       component: () => import('@/views/LoginView.vue'),
-      meta: { title: 'login' }
+      meta: { title: 'login' },
+      beforeEnter: async (to, from, next) => {
+        const userStore = useUserStore()
+        if (await userStore.checkAuth(true)) {
+          next({ name: 'home' })
+        } else {
+          next()
+        }
+      }
     },
     {
       path: '/resource/:resourceId',
@@ -49,4 +58,7 @@ const router = createRouter({
 })
 
 
+
+
+
 export default router

package/dist/spa/spa/src/stores/core.ts

@@ -8,7 +8,7 @@ export const useCoreStore = defineStore('core', () => {
   const resourceById: Ref<Object> = ref({});
   const menu = ref([]);
   const config = ref({});
-  const record = ref({});
+  const record: Ref<any | null> = ref({});
   const resource: Ref<AdminForthResource | null> = ref(null);
 
   const resourceColumnsWithFilters = computed(() => {
@@ -67,9 +67,17 @@ export const useCoreStore = defineStore('core', () => {
       }
     });
 
-    console.log('📦 record', respData);
-    record.value = respData.data[0];
-    resourceOptions.value = respData.options;
+    if (respData.error) {
+      window.adminforth.alert({
+        message: respData.error,
+        variant: 'danger',
+        timeout: 'unlimited'
+      });
+      record.value = {};
+    } else {
+      record.value = respData.data[0];
+    }
+
   }
 
   async function fetchResourceFull({ resourceId }: { resourceId: string }) {
@@ -103,12 +111,7 @@ export const useCoreStore = defineStore('core', () => {
     config.value = {...config.value, ...res};
   }
 
-  async function logout() {
-    await callAdminForthApi({
-      path: '/logout',
-      method: 'POST',
-    });
-  }
+ 
 
   const username = computed(() => {
     const usernameField = config.value.usernameField;
@@ -134,7 +137,6 @@ export const useCoreStore = defineStore('core', () => {
     fetchResourceFull, 
     resourceColumnsError,
     resourceOptions,
-    logout,
     resource,
     adminUser,
     resourceColumnsWithFilters

package/dist/spa/spa/src/stores/user.ts

@@ -0,0 +1,50 @@
+import {ref} from 'vue';
+import {defineStore} from 'pinia';
+import { callAdminForthApi } from '@/utils';
+
+export const useUserStore = defineStore('user', () => {
+    const isAuthorized = ref(false);
+
+    function authorize() {
+        isAuthorized.value = true;
+    }
+
+    function unauthorize() {
+        isAuthorized.value = false;
+    }
+
+    async function logout() {
+        await callAdminForthApi({
+          path: '/logout',
+          method: 'POST',
+        });
+      }
+
+    async function checkAuth( skipApiCall = false){
+        if(isAuthorized.value) return true;
+        else {
+            if(skipApiCall) return false;
+            const resp = await callAdminForthApi({
+                path: '/check_auth',
+                method: 'POST',
+            });
+            if (resp.status !== 401) {
+                authorize();
+                return true;
+            }
+            else {
+                unauthorize();
+                return false;}
+        }
+        
+    }
+
+    return {
+        isAuthorized,
+        authorize,
+        unauthorize,
+        checkAuth,
+        logout
+    }
+
+});        

package/dist/spa/spa/src/utils.ts

@@ -4,6 +4,7 @@ import type {  CoreConfig } from './spa_types/core';
 import router from "./router";
 import { useRouter } from 'vue-router';
 import { useCoreStore } from './stores/core';
+import { useUserStore } from './stores/user';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -16,14 +17,18 @@ export async function callApi({path, method, body=undefined} ) {
   const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
   const r = await fetch(fullPath, options);
   if (r.status == 401) {
-    console.log('router', router);
-    router.push({name: 'login'});
+    useUserStore().unauthorize();
+    router.push({ name: 'login' });
     return null;
   }
   return await r.json();
 }
 
-export async function callAdminForthApi({ path, method, body=undefined }) {
+export async function callAdminForthApi({ path, method, body=undefined }: {
+  path: string,
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE',
+  body?: any
+}) {
   try {
     return callApi({path: `/adminapi/v1${path}`, method, body} );
   } catch (e) {

package/dist/spa/spa/src/views/CreateView.vue

@@ -137,6 +137,13 @@ async function saveRecord() {
       record: record.value,
     },
   });
+  if (response.error) {
+    window.adminforth.alert({
+      message: resp.error,
+      variant: 'danger',
+      timeout: 'unlimited',
+    })
+  }
   saving.value = false;
   if (route.query.returnTo) {
     router.push(route.query.returnTo);

package/dist/spa/spa/src/views/EditView.vue

@@ -145,7 +145,7 @@ async function saveRecord() {
     }
   }
 
-  await callAdminForthApi({
+  const resp = await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
@@ -154,6 +154,13 @@ async function saveRecord() {
       record: updates,
     },
   });
+  if (resp.error) {
+    window.adminforth.alert({
+      message: resp.error,
+      variant: 'danger',
+      timeout: 'unlimited',
+    })
+  }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });
 }

package/dist/spa/spa/src/views/ListView.vue

@@ -183,7 +183,16 @@ async function getList() {
       sort: sort.value,
     }
   });
-
+  if (data.error) {
+    window.adminforth.alert({
+      message: data.error,
+      variant: 'danger',
+      timeout: 'unlimited',
+    });
+    rows.value = [];
+    totalRows.value = 0;
+    return;
+  }
   rows.value = data.data?.map(row => {
     row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name];
     return row;

package/dist/types/AdminForthConfig.js

@@ -52,6 +52,15 @@ export var AdminForthResourcePages;
     AdminForthResourcePages["create"] = "create";
     AdminForthResourcePages["filter"] = "filter";
 })(AdminForthResourcePages || (AdminForthResourcePages = {}));
+export var AllowedActionsEnum;
+(function (AllowedActionsEnum) {
+    AllowedActionsEnum["show"] = "show";
+    AllowedActionsEnum["list"] = "list";
+    AllowedActionsEnum["edit"] = "edit";
+    AllowedActionsEnum["create"] = "create";
+    AllowedActionsEnum["delete"] = "delete";
+    AllowedActionsEnum["filter"] = "filter";
+})(AllowedActionsEnum || (AllowedActionsEnum = {}));
 export var AdminForthDataTypes;
 (function (AdminForthDataTypes) {
     AdminForthDataTypes["STRING"] = "string";

package/dist/types/FrontendAPI.js

@@ -1,7 +1,7 @@
 export var AlertVariant;
 (function (AlertVariant) {
-    AlertVariant["Danger"] = "danger";
-    AlertVariant["Success"] = "success";
-    AlertVariant["Warning"] = "warning";
-    AlertVariant["Info"] = "info";
+    AlertVariant["danger"] = "danger";
+    AlertVariant["success"] = "success";
+    AlertVariant["warning"] = "warning";
+    AlertVariant["info"] = "info";
 })(AlertVariant || (AlertVariant = {}));