hotfix - login page (#29)

enjin · Aug 21, 2023 · 4919859 · 4919859
1 parent da0d321
commit 4919859
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="h-full flex flex-row">
-        <SideNavbar v-if="appStore.hasValidConfig" />
+        <SideNavbar v-if="appStore.loggedIn" />
         <SnackbarGroup />
 
         <div class="flex flex-col w-full overflow-hidden">

diff --git a/resources/js/components/pages/auth/Login.vue b/resources/js/components/pages/auth/Login.vue
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import { Form } from 'vee-validate';
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useAppStore } from '~/store';
 import Btn from '~/components/Btn.vue';
@@ -119,8 +119,15 @@ const checkVerified = () => {
 
 (async () => {
     checkVerified();
-    if (appStore.hasValidConfig) {
+    if (appStore.loggedIn) {
         redirectToCollections();
     }
 })();
+
+watch(
+    () => appStore.hasValidConfig,
+    () => {
+        if (appStore.hasValidConfig) router.push({ name: 'platform.collections' });
+    }
+);
 </script>
diff --git a/resources/js/components/pages/auth/Register.vue b/resources/js/components/pages/auth/Register.vue
@@ -119,7 +119,7 @@ const register = async () => {
 };
 
 (async () => {
-    if (appStore.hasValidConfig) {
+    if (appStore.loggedIn) {
         redirectToLogin();
     }
 })();

diff --git a/resources/js/components/pages/auth/RequestResetPassword.vue b/resources/js/components/pages/auth/RequestResetPassword.vue
@@ -93,7 +93,7 @@ const requestReset = async () => {
 };
 
 (async () => {
-    if (appStore.hasValidConfig) {
+    if (appStore.loggedIn) {
         redirectToCollections();
     }
 })();

diff --git a/resources/js/components/pages/auth/ResetPassword.vue b/resources/js/components/pages/auth/ResetPassword.vue
@@ -106,7 +106,7 @@ const resetPassword = async () => {
 
 (async () => {
     email.value = route.query.email as string;
-    if (appStore.hasValidConfig) {
+    if (appStore.loggedIn) {
         redirectToCollections();
     }
 })();

diff --git a/resources/js/util/auth.guard.ts b/resources/js/util/auth.guard.ts
@@ -7,6 +7,7 @@ export function initAuthGuard(router: Router) {
 
         const validConfig = appStore.hasValidConfig;
         const isMultiTenant = appStore.isMultiTenant;
+        const isLoggedIn = appStore.loggedIn;
 
         const requiresAuth = to.matched.some((record) => record.meta.requiresAuth);
         const requiresToken = to.matched.some((record) => record.meta.requiresToken);
@@ -20,21 +21,21 @@ export function initAuthGuard(router: Router) {
                 return;
             }
 
-            if (requiresAuth && !validConfig) {
+            if (requiresAuth && !isLoggedIn) {
                 next({ name: 'platform.auth.login' });
-            } else if (requiresToken && appStore.user && !validConfig) {
+            } else if (requiresToken && appStore.user && !isLoggedIn) {
                 next({ name: 'platform.user.settings' });
-            } else if (to.name == 'platform.auth.login' && validConfig) {
+            } else if (to.name == 'platform.auth.login' && isLoggedIn) {
                 next({ name: 'platform.collections' });
             } else {
                 next();
             }
         } else {
-            if (requiresAuth && !validConfig) {
+            if (requiresAuth && !isLoggedIn) {
                 next({ name: 'platform.setup' });
-            } else if (to.name == 'platform.auth.login' && !validConfig) {
+            } else if (to.name == 'platform.auth.login' && !isLoggedIn) {
                 next({ name: 'platform.setup' });
-            } else if (to.name == 'platform.setup' && validConfig) {
+            } else if (to.name == 'platform.setup' && validConfig && isLoggedIn) {
                 next({ name: 'platform.collections' });
             } else {
                 next();