From 4919859f3b4518bc90cc3f2d5ef8d19b3ba6afb5 Mon Sep 17 00:00:00 2001
From: Zouheir Layine <58786497+zlayine@users.noreply.github.com>
Date: Mon, 21 Aug 2023 17:54:25 +0300
Subject: [PATCH] hotfix - login page (#29)

---
 resources/js/components/App.vue                     |  2 +-
 resources/js/components/pages/auth/Login.vue        | 11 +++++++++--
 resources/js/components/pages/auth/Register.vue     |  2 +-
 .../components/pages/auth/RequestResetPassword.vue  |  2 +-
 .../js/components/pages/auth/ResetPassword.vue      |  2 +-
 resources/js/util/auth.guard.ts                     | 13 +++++++------
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
index a0a541f..48d90c5 100644
--- 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
index 5df6c4b..c1e88e4 100644
--- 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
index 253b9b5..7e61313 100644
--- 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
index 8f5808b..5a95d3b 100644
--- 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
index 990c7bf..dd83caa 100644
--- 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
index 0cfa75f..dff9f4f 100644
--- 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();