adminforth 1.2.7 → 1.2.9

package/dist/servers/express.js

@@ -190,6 +190,7 @@ class ExpressServer {
                 status: 200,
                 message: undefined,
                 setHeader(name, value) {
+                    process.env.HEAVY_DEBUG && console.log(' 🪲Setting header', name, value);
                     this.headers.push([name, value]);
                 },
                 setStatus(code, message) {

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

@@ -294,8 +294,8 @@ watch (()=>coreStore.menu, () => {
 watch([loggedIn,  routerIsReady, loginRedirectCheckIsReady], ([l,r,lr]) => {
   if (l && r && lr) {
     setTimeout(() => {
-    initFlowbite();
-  }); 
+      initFlowbite();
+    }); 
   }
 })
 

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

@@ -1,6 +1,12 @@
-import {ref} from 'vue';
-import {defineStore} from 'pinia';
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
 import { callAdminForthApi } from '@/utils';
+import { initFlowbite } from 'flowbite'
+import { useRouter } from 'vue-router';
+import { useCoreStore } from './core';
+import router from '@/router';
+
+
 
 export const useUserStore = defineStore('user', () => {
     const isAuthorized = ref(false);
@@ -15,6 +21,19 @@ export const useUserStore = defineStore('user', () => {
         localStorage.setItem('isAuthorized', 'false');
     }
 
+    async function finishLogin() {
+        const coreStore = useCoreStore();
+        authorize(); // TODO not sure we need this approach with localStorage
+        await router.push('/');
+        await router.isReady();
+        await coreStore.fetchMenuAndResource();
+        setTimeout(() => {
+            debugger;
+                initFlowbite();
+
+        }); 
+    }
+
     async function logout() {
         await callAdminForthApi({
           path: '/logout',
@@ -48,7 +67,8 @@ export const useUserStore = defineStore('user', () => {
         isAuthorized,
         authorize,
         unauthorize,
-        logout
+        logout,
+        finishLogin
     }
 
 });        

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

@@ -85,7 +85,6 @@ import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
-import { initFlowbite } from 'flowbite'
 
 
 const router = useRouter();
@@ -120,17 +119,9 @@ async function login() {
       error.value = resp.error;
     } else if (resp.redirectTo) {
       router.push(resp.redirectTo);
-    }
-     else {
+    } else {
       error.value = null;
-      user.authorize()
-      router.push('/');
-      await router.isReady();
-      await coreStore.fetchMenuAndResource();
-      setTimeout(() => {
-        initFlowbite();
-      }); 
-
+      await user.finishLogin();
     }
 
 }

package/package.json

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

package/servers/express.ts

@@ -207,6 +207,7 @@ class ExpressServer implements IExpressHttpServer {
         status: 200,
         message: undefined,
         setHeader(name, value) {
+          process.env.HEAVY_DEBUG && console.log(' 🪲Setting header', name, value);
           this.headers.push([name, value]);
         },
         

package/spa/src/App.vue

@@ -294,8 +294,8 @@ watch (()=>coreStore.menu, () => {
 watch([loggedIn,  routerIsReady, loginRedirectCheckIsReady], ([l,r,lr]) => {
   if (l && r && lr) {
     setTimeout(() => {
-    initFlowbite();
-  }); 
+      initFlowbite();
+    }); 
   }
 })
 

package/spa/src/stores/user.ts

@@ -1,6 +1,12 @@
-import {ref} from 'vue';
-import {defineStore} from 'pinia';
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
 import { callAdminForthApi } from '@/utils';
+import { initFlowbite } from 'flowbite'
+import { useRouter } from 'vue-router';
+import { useCoreStore } from './core';
+import router from '@/router';
+
+
 
 export const useUserStore = defineStore('user', () => {
     const isAuthorized = ref(false);
@@ -15,6 +21,19 @@ export const useUserStore = defineStore('user', () => {
         localStorage.setItem('isAuthorized', 'false');
     }
 
+    async function finishLogin() {
+        const coreStore = useCoreStore();
+        authorize(); // TODO not sure we need this approach with localStorage
+        await router.push('/');
+        await router.isReady();
+        await coreStore.fetchMenuAndResource();
+        setTimeout(() => {
+            debugger;
+                initFlowbite();
+
+        }); 
+    }
+
     async function logout() {
         await callAdminForthApi({
           path: '/logout',
@@ -48,7 +67,8 @@ export const useUserStore = defineStore('user', () => {
         isAuthorized,
         authorize,
         unauthorize,
-        logout
+        logout,
+        finishLogin
     }
 
 });        

package/spa/src/views/LoginView.vue

@@ -85,7 +85,6 @@ import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
-import { initFlowbite } from 'flowbite'
 
 
 const router = useRouter();
@@ -120,17 +119,9 @@ async function login() {
       error.value = resp.error;
     } else if (resp.redirectTo) {
       router.push(resp.redirectTo);
-    }
-     else {
+    } else {
       error.value = null;
-      user.authorize()
-      router.push('/');
-      await router.isReady();
-      await coreStore.fetchMenuAndResource();
-      setTimeout(() => {
-        initFlowbite();
-      }); 
-
+      await user.finishLogin();
     }
 
 }