add next param support for signup

Author: ivictbor

adminforth/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.5.8-next.20",
+  "version": "1.5.8-next.21",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",

adminforth/package.json

@@ -133,7 +133,7 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref, computed, Ref } from 'vue';
+import { onMounted, ref, computed, Ref, onBeforeMount } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
@@ -230,7 +230,36 @@ const passwordConstraints: Ref<{
   validation: '',
 });
 
+// implement something similar to beforeEnter
+// beforeEnter: async (to, from, next) => {
+//         if(localStorage.getItem('isAuthorized') === 'true') {
+//           // check if url has next=... and redirect to it
+//           console.log('to.query', to.query)
+//           if (to.query.next) {
+//             next(to.query.next.toString())
+//           } else {
+//             next({name: 'home'});
+//           }
+//         } else {
+//           next()
+//         }
+//       } 
+
+onBeforeMount(() => {
+  if (localStorage.getItem('isAuthorized') === 'true') {
+    // if route has next param, redirect
+    coreStore.fetchMenuAndResource();
+    if (route.query.next) {
+      router.push(route.query.next.toString());
+    } else {
+      router.push({ name: 'home' });
+    }
+  }
+})
+
 onMounted(async () => {
+
+
   await coreStore.getPublicConfig();
   // getPasswordConstraints
   passwordConstraints.value = await callAdminForthApi({

adminforth/plugins/open-signup/custom/SignupPage.vue

@@ -10,6 +10,7 @@ export const useUserStore = defineStore('user', () => {
     const isAuthorized = ref(false);
 
     function authorize() {
+        // syncing isAuthorized allows us to use navigation guards without waiting for user api response
         isAuthorized.value = true;
         localStorage.setItem('isAuthorized', 'true');
     }
@@ -21,9 +22,14 @@ export const useUserStore = defineStore('user', () => {
 
     async function finishLogin() {
         const coreStore = useCoreStore();
-        authorize(); // TODO not sure we need this approach with localStorage
+        authorize();
         reconnect();
-        await router.push('/');
+        // if next param in route, redirect to it
+        if (router.currentRoute.value.query.next) {
+            await router.push(router.currentRoute.value.query.next.toString());
+        } else {
+            await router.push('/');
+        }
         await router.isReady();
         await coreStore.fetchMenuAndResource();
     }