fix(auth): fix endless authentication loop

Redirect to auth page was not working correctly; leading to endless redirects causing browser to crash.
GEWIS · Nov 8, 2024 · 69f4f44 · 69f4f44
1 parent 03d78bd
commit 69f4f44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -139,7 +139,7 @@ router.beforeEach(async (to, from, next) => {
   layoutStore.init();
 
   const authStore = useAuthStore();
-  // Automatically login using mock when in devops mode
+  // Automatically login using mock when in development mode
   if (!import.meta.env.PROD && !authStore.isAuthenticated()) {
     await authStore.MockLogin({
       id: 'dev',
@@ -156,7 +156,7 @@ router.beforeEach(async (to, from, next) => {
     hasRights = authStore.isInSecurityGroup(to.meta.securityGroup, to.meta.securitySection);
   }
 
-  if (!authenticated) {
+  if (!authenticated && !to.path.startsWith('/auth')) {
     // If not authenticated; redirect to login
     next({ name: 'auth', query: { path: to.fullPath } });
   } else if (authenticated && !hasRights) {

diff --git a/src/stores/auth.store.ts b/src/stores/auth.store.ts
@@ -51,11 +51,13 @@ export const useAuthStore = defineStore('auth', {
      */
     async init(): Promise<void> {
       getInformation().then(async (user) => {
-        this.name = user.data!.name;
-        this.roles = user.data!.roles;
+        if (user.data) {
+          this.name = user.data!.name;
+          this.roles = user.data!.roles;
 
-        await useHandlersStore().init();
-        await useColorStore().init();
+          await useHandlersStore().init();
+          await useColorStore().init();
+        }
       });
 
       const securityGroups = await getSecurityGroups();
@@ -124,6 +126,7 @@ export const useAuthStore = defineStore('auth', {
      * @param section - The security group to check for
      */
     isInSecurityGroup(group: keyof ISecurityGroups, section: keyof ISecuritySections): boolean {
+      if (!this.securityGroups) return false;
       return _.intersection(this.roles, this.securityGroups![group][section]).length > 0;
     }
   }

diff --git a/src/views/Base/AuthView.vue b/src/views/Base/AuthView.vue
@@ -59,7 +59,8 @@ onMounted(async () => {
         session_state: queryParameters.get('session_state')!
       })
       .then(() => {
-        router.push(url!);
+        authStore.init();
+        router.push(url ?? '/');
       })
       .catch(() => {
         router.push({ name: 'notFound' });
@@ -71,6 +72,9 @@ onMounted(async () => {
     sessionStorage.setItem('url', route.query.path as string);
 
     const oidcParameters = await getOidcParameters();
+    // If the oidc parameters are not available, retry auth
+    if (!oidcParameters.data) await router.push({ name: 'auth' });
+
     let queryParameters = new URLSearchParams({
       client_id: oidcParameters.data!.clientId,
       redirect_uri: oidcParameters.data!.redirectUri,