From f94b7808f786e92629d4f1dc54e189b2f770892a Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Sat, 19 Apr 2025 12:39:58 +0200
Subject: [PATCH] fix(frontend): 'requiresAuth' routes niet meer zonder
 authenticatie toegankelijk

---
 frontend/src/App.vue                       | 4 ----
 frontend/src/main.ts                       | 2 ++
 frontend/src/router/index.ts               | 5 ++---
 frontend/src/services/auth/auth-service.ts | 3 ---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 4b885403..b1207448 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -10,10 +10,6 @@
     }
 
     const showMenuBar = computed(() => (route.meta as RouteMeta).requiresAuth && auth.authState.user);
-
-    auth.loadUser().catch((_error) => {
-        // TODO Could not load user!
-    });
 </script>
 
 <template>
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index b5315634..e4bdde40 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -12,9 +12,11 @@ import App from "./App.vue";
 import router from "./router";
 import { aliases, mdi } from "vuetify/iconsets/mdi";
 import { VueQueryPlugin, QueryClient } from "@tanstack/vue-query";
+import authService from "./services/auth/auth-service.ts";
 
 const app = createApp(App);
 
+await authService.loadUser();
 app.use(router);
 
 const link = document.createElement("link");
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index e7aa8d24..7180be26 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -139,15 +139,14 @@ const router = createRouter({
             component: NotFound,
             meta: { requiresAuth: false },
         },
-    ],
+    ]
 });
 
 router.beforeEach(async (to, _from, next) => {
     // Verify if user is logged in before accessing certain routes
     if (to.meta.requiresAuth) {
         if (!authState.isLoggedIn.value) {
-            //Next("/login");
-            next();
+            next("/login");
         } else {
             next();
         }
diff --git a/frontend/src/services/auth/auth-service.ts b/frontend/src/services/auth/auth-service.ts
index 51493a0c..6ea13440 100644
--- a/frontend/src/services/auth/auth-service.ts
+++ b/frontend/src/services/auth/auth-service.ts
@@ -117,14 +117,11 @@ async function renewToken(): Promise<User | null> {
  * End the session of the current user.
  */
 async function logout(): Promise<void> {
-    console.log("LOGOUT");
     const activeRole = authStorage.getActiveRole();
     if (activeRole) {
         await (await getUserManagers())[activeRole].signoutRedirect();
         authStorage.deleteActiveRole();
         clearAuthState();
-    } else {
-        console.log("No active role!!");
     }
 }