Fix login redirect (#975)

* remove await from logout redirect * catch error when token is unparsable * move login redirect to parent layout to reduce redundant code
NASA-AMMOS · Nov 1, 2023 · edde9ae · edde9ae
1 parent d31472a
commit edde9ae
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 192 deletions.
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
@@ -7,56 +7,61 @@ import { isLoginEnabled } from './utilities/login';
 import { ADMIN_ROLE } from './utilities/permissions';
 
 export const handle: Handle = async ({ event, resolve }) => {
-  if (!isLoginEnabled()) {
-    const permissibleQueries = await effects.getUserQueries(null);
-    const rolePermissions = await effects.getRolePermissions(null);
-    event.locals.user = {
-      activeRole: ADMIN_ROLE,
-      allowedRoles: [ADMIN_ROLE],
-      defaultRole: ADMIN_ROLE,
-      id: 'unknown',
-      permissibleQueries,
-      rolePermissions,
-      token: '',
-    };
-  } else {
-    const cookieHeader = event.request.headers.get('cookie') ?? '';
-    const cookies = parse(cookieHeader);
-    const { activeRole: activeRoleCookie = null, user: userCookie = null } = cookies;
+  try {
+    if (!isLoginEnabled()) {
+      const permissibleQueries = await effects.getUserQueries(null);
+      const rolePermissions = await effects.getRolePermissions(null);
+      event.locals.user = {
+        activeRole: ADMIN_ROLE,
+        allowedRoles: [ADMIN_ROLE],
+        defaultRole: ADMIN_ROLE,
+        id: 'unknown',
+        permissibleQueries,
+        rolePermissions,
+        token: '',
+      };
+    } else {
+      const cookieHeader = event.request.headers.get('cookie') ?? '';
+      const cookies = parse(cookieHeader);
+      const { activeRole: activeRoleCookie = null, user: userCookie = null } = cookies;
 
-    if (userCookie) {
-      const userBuffer = Buffer.from(userCookie, 'base64');
-      const userStr = userBuffer.toString('utf-8');
-      const baseUser: BaseUser = JSON.parse(userStr);
-      const { success } = await effects.session(baseUser);
-      const decodedToken: ParsedUserToken = jwtDecode(baseUser.token);
+      if (userCookie) {
+        const userBuffer = Buffer.from(userCookie, 'base64');
+        const userStr = userBuffer.toString('utf-8');
+        const baseUser: BaseUser = JSON.parse(userStr);
+        const { success } = await effects.session(baseUser);
+        const decodedToken: ParsedUserToken = jwtDecode(baseUser.token);
 
-      if (success) {
-        const allowedRoles = decodedToken['https://hasura.io/jwt/claims']['x-hasura-allowed-roles'];
-        const defaultRole = decodedToken['https://hasura.io/jwt/claims']['x-hasura-default-role'];
-        const activeRole = activeRoleCookie ?? defaultRole;
-        const user: User = {
-          ...baseUser,
-          activeRole,
-          allowedRoles,
-          defaultRole,
-          permissibleQueries: null,
-          rolePermissions: null,
-        };
-        const permissibleQueries = await effects.getUserQueries(user);
+        if (success) {
+          const allowedRoles = decodedToken['https://hasura.io/jwt/claims']['x-hasura-allowed-roles'];
+          const defaultRole = decodedToken['https://hasura.io/jwt/claims']['x-hasura-default-role'];
+          const activeRole = activeRoleCookie ?? defaultRole;
+          const user: User = {
+            ...baseUser,
+            activeRole,
+            allowedRoles,
+            defaultRole,
+            permissibleQueries: null,
+            rolePermissions: null,
+          };
+          const permissibleQueries = await effects.getUserQueries(user);
 
-        const rolePermissions = await effects.getRolePermissions(user);
-        event.locals.user = {
-          ...user,
-          permissibleQueries,
-          rolePermissions,
-        };
+          const rolePermissions = await effects.getRolePermissions(user);
+          event.locals.user = {
+            ...user,
+            permissibleQueries,
+            rolePermissions,
+          };
+        } else {
+          event.locals.user = null;
+        }
       } else {
         event.locals.user = null;
       }
-    } else {
-      event.locals.user = null;
     }
+  } catch (e) {
+    console.log(e);
+    event.locals.user = null;
   }
 
   return await resolve(event);

diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -1,5 +1,11 @@
+import { base } from '$app/paths';
+import { redirect } from '@sveltejs/kit';
+import { shouldRedirectToLogin } from '../utilities/login';
 import type { LayoutServerLoad } from './$types';
 
-export const load: LayoutServerLoad = async ({ locals }) => {
+export const load: LayoutServerLoad = async ({ locals, url }) => {
+  if (!url.pathname.includes('login') && shouldRedirectToLogin(locals.user)) {
+    throw redirect(302, `${base}/login`);
+  }
   return { ...locals };
 };
diff --git a/src/routes/constraints/+page.ts b/src/routes/constraints/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../utilities/effects';
-import { shouldRedirectToLogin } from '../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const {
     modelMap: initialModelMap,
     planMap: initialPlanMap,

diff --git a/src/routes/constraints/edit/[id]/+page.ts b/src/routes/constraints/edit/[id]/+page.ts
@@ -2,16 +2,11 @@ import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
 import effects from '../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../utilities/generic';
-import { shouldRedirectToLogin } from '../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { id: constraintIdParam } = params;
 
   if (constraintIdParam !== null && constraintIdParam !== undefined) {

diff --git a/src/routes/constraints/new/+page.ts b/src/routes/constraints/new/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../../utilities/effects';
-import { shouldRedirectToLogin } from '../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const {
     modelMap: initialModelMap,
     models: initialModels,

diff --git a/src/routes/dictionaries/+page.ts b/src/routes/dictionaries/+page.ts
@@ -1,14 +1,7 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
-import { shouldRedirectToLogin } from '../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   return { user };
 };
diff --git a/src/routes/expansion/rules/+page.ts b/src/routes/expansion/rules/+page.ts
@@ -1,14 +1,7 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
-import { shouldRedirectToLogin } from '../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   return { user };
 };
diff --git a/src/routes/expansion/rules/edit/[id]/+page.ts b/src/routes/expansion/rules/edit/[id]/+page.ts
@@ -1,16 +1,11 @@
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
 import effects from '../../../../../utilities/effects';
-import { shouldRedirectToLogin } from '../../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { id: ruleIdParam } = params;
 
   if (ruleIdParam !== null && ruleIdParam !== undefined) {

diff --git a/src/routes/expansion/rules/new/+page.ts b/src/routes/expansion/rules/new/+page.ts
@@ -1,14 +1,7 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
-import { shouldRedirectToLogin } from '../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   return { user };
 };
diff --git a/src/routes/expansion/runs/+page.ts b/src/routes/expansion/runs/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../../utilities/effects';
-import { shouldRedirectToLogin } from '../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const expansionRuns = await effects.getExpansionRuns(user);
 
   return { expansionRuns };

diff --git a/src/routes/expansion/sets/+page.ts b/src/routes/expansion/sets/+page.ts
@@ -1,14 +1,7 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
-import { shouldRedirectToLogin } from '../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   return { user };
 };
diff --git a/src/routes/expansion/sets/new/+page.ts b/src/routes/expansion/sets/new/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../../../utilities/effects';
-import { shouldRedirectToLogin } from '../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { plans: initialPlans } = await effects.getPlansAndModels(user);
 
   return { initialPlans, user };

diff --git a/src/routes/models/+page.ts b/src/routes/models/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../utilities/effects';
-import { shouldRedirectToLogin } from '../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const initialModels = await effects.getModels(user);
 
   return {

diff --git a/src/routes/plans/+page.ts b/src/routes/plans/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../utilities/effects';
-import { shouldRedirectToLogin } from '../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { models = [], plans = [] } = await effects.getPlansAndModels(user);
 
   return {

diff --git a/src/routes/plans/[id]/+page.ts b/src/routes/plans/[id]/+page.ts
@@ -3,16 +3,11 @@ import { redirect } from '@sveltejs/kit';
 import { SearchParameters } from '../../../enums/searchParameters';
 import effects from '../../../utilities/effects';
 import { getSearchParameterNumber } from '../../../utilities/generic';
-import { shouldRedirectToLogin } from '../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params, url }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { id } = params;
   const planId = parseFloat(id);
 

diff --git a/src/routes/plans/[id]/merge/+page.ts b/src/routes/plans/[id]/merge/+page.ts
@@ -6,16 +6,11 @@ import type {
   PlanMergeRequestSchema,
 } from '../../../../types/plan';
 import effects from '../../../../utilities/effects';
-import { shouldRedirectToLogin } from '../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { id } = params;
   const planId = parseFloat(id);
 

diff --git a/src/routes/scheduling/+page.ts b/src/routes/scheduling/+page.ts
@@ -1,16 +1,9 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
 import effects from '../../utilities/effects';
-import { shouldRedirectToLogin } from '../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { models = [], plans = [] } = await effects.getPlansAndModelsForScheduling(user);
 
   return {

diff --git a/src/routes/scheduling/conditions/edit/[id]/+page.ts b/src/routes/scheduling/conditions/edit/[id]/+page.ts
@@ -2,16 +2,11 @@ import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
 import effects from '../../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../../utilities/generic';
-import { shouldRedirectToLogin } from '../../../../../utilities/login';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
   const { user } = await parent();
 
-  if (shouldRedirectToLogin(user)) {
-    throw redirect(302, `${base}/login`);
-  }
-
   const { id: conditionIdParam } = params;
   const { models = [], plans = [] } = await effects.getPlansAndModelsForScheduling(user);