From a3c209da650964d47e5f9f55db4c50f3aaeebd4b Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Tue, 4 Jul 2023 09:39:44 -0400
Subject: [PATCH] Fix invalid token redirection

---
 web/src/App.vue         | 18 ++++++++++++------
 web/src/router/index.ts |  2 +-
 web/src/views/Login.vue | 15 +++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index e7a6623..a268a55 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -5,24 +5,30 @@
   </div>
   <v-app>
     <v-main>
-      <keep-alive>
-        <RouterView />
-      </keep-alive>
+      <router-view v-slot="{ Component }">
+        <keep-alive>
+          <component :is="Component" />
+        </keep-alive>
+      </router-view>
     </v-main>
   </v-app>
 </template>
 
 <script setup lang="ts">
+import { useRouter } from 'vue-router'
 import { useAppStore } from './store/appStore'
-import { onMounted, onBeforeMount } from 'vue'
+import { onMounted } from 'vue'
 
+const router = useRouter()
 const appStore = useAppStore()
 
 onMounted(async () => {
   await appStore.fetchMe()
-})
 
-onBeforeMount(() => {
+  if (!appStore.me) {
+    console.log('Not logged in')
+    router.replace({ name: 'Login' })
+  }
   appStore.selectedCampus = appStore.me?.campus || ''
 })
 </script>
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index 0e039d1..7c65776 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -41,7 +41,7 @@ const routes = [
     component: () => import('@/layouts/single/Default.vue'),
     children: [
       {
-        path: ':serialNumber',
+        path: '',
         name: 'Printer',
         // route level code-splitting
         // this generates a separate chunk (about.[hash].js) for this route
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 8c05238..e138f93 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -62,20 +62,15 @@
 <script lang="ts" setup>
 import { ref, reactive } from 'vue'
 import { api } from '@/api'
-import { getJwtToken, saveJwtToken } from '@/auth'
+import { saveJwtToken } from '@/auth'
 import { useRouter } from 'vue-router'
 import { useAppStore } from '@/store/appStore'
 
+const appStore = useAppStore()
+
 const router = useRouter()
 
-const token = getJwtToken()
-
-const { fetchMe } = useAppStore()
-
-if (token) {
-  fetchMe()
-  router.replace({ name: 'Home' })
-}
+if (appStore.me) router.push({ name: 'Home' })
 
 const username = ref<string>('')
 const password = ref<string>('')
@@ -102,7 +97,7 @@ async function login() {
 
     saveJwtToken(token)
 
-    await fetchMe()
+    await appStore.fetchMe()
 
     router.push({ name: 'Home' })
   } catch (error: any) {