Various fixes and cleanup

Author: 7dev7urandom

src/auth.ts

@@ -367,7 +367,7 @@ export const populateSecurityInfo: Handle = async ({ event, resolve }) => {
         'auth.user': user ? user.Email + ' - ' + user.Id : 'null',
         'auth.user.OrganizationMemberships':
           user?.OrganizationMemberships.map((o) => o.OrganizationId).join(', ') ?? 'null',
-        'auth.user.roles': user ? JSON.stringify([...security.roles.entries()]) : 'null',
+        'auth.user.roles': user ? JSON.stringify(security.roles) : 'null',
         'auth.user.IsLocked': user ? user.IsLocked + '' : 'null'
       });
 

src/lib/utils/index.ts

@@ -43,12 +43,6 @@ export function enumNumVals<E extends Record<string, string | number>>(e: E): nu
   return Object.values(e).filter((v) => !(typeof v === 'string'));
 }
 
-export enum ServerStatus {
-  Ok = 200,
-  Forbidden = 403,
-  NotFound = 404
-}
-
 function pushToast(type: 'info' | 'success' | 'warning' | 'error', message: string) {
   toast.push(message, { pausable: true, classes: [type] });
 }

src/routes/(authenticated)/projects/[filter=projectSelector]/[[orgId=idNumber]]/+page.server.ts

@@ -1,9 +1,9 @@
 import type { Prisma } from '@prisma/client';
-import { error } from '@sveltejs/kit';
+import { type Actions, error } from '@sveltejs/kit';
 import { fail, superValidate } from 'sveltekit-superforms';
 import { valibot } from 'sveltekit-superforms/adapters';
 import * as v from 'valibot';
-import type { Actions, PageServerLoad } from './$types';
+import type { PageServerLoad } from './$types';
 import { RoleId } from '$lib/prisma';
 import { ProductActionType } from '$lib/products';
 import { doProductAction } from '$lib/products/server';

src/routes/+layout.server.ts

@@ -2,6 +2,5 @@ import type { LayoutServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async (event) => {
   event.locals.security.requireNothing();
-  const uData = await event.locals.auth();
-  return { session: uData! };
+  return { session: (await event.locals.auth())! };
 };