From a5dc9b32bed95ba6fd79e32e669c3af9d6f4b1a0 Mon Sep 17 00:00:00 2001
From: cirroskais <cirroskais@madhouselabs.net>
Date: Sat, 27 Apr 2024 04:10:05 -0400
Subject: [PATCH] tyep fixes

---
 src/app.d.ts                            | 16 ++++++++++++++++
 src/hooks.server.js                     | 17 ++++++++---------
 src/lib/config.js                       |  8 +++++++-
 src/lib/types/user.d.ts                 |  5 +++++
 src/routes/(app)/dashboard/+page.svelte |  2 +-
 src/routes/+layout.server.js            |  2 +-
 6 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 src/app.d.ts
 create mode 100644 src/lib/types/user.d.ts

diff --git a/src/app.d.ts b/src/app.d.ts
new file mode 100644
index 0000000..860cdab
--- /dev/null
+++ b/src/app.d.ts
@@ -0,0 +1,16 @@
+declare global {
+	namespace App {
+		interface Error {
+			status: number;
+			message: string;
+		}
+		interface Locals {
+			user: User;
+		}
+		interface PageData {}
+		// interface PageState {}
+		// interface Platform {}
+	}
+}
+
+export {};
diff --git a/src/hooks.server.js b/src/hooks.server.js
index 6d712fe..0f4e54b 100644
--- a/src/hooks.server.js
+++ b/src/hooks.server.js
@@ -15,18 +15,17 @@ const PUBLIC_RESOURCES = [
 export async function handle({ event, resolve }) {
 	const { cookies, locals } = event;
 	const session = await getSession(cookies.get(COOKIE));
-	const user = session?.user;
 
-	if (user) {
+	if (session && session.user) {
 		locals.user = {
-			id: user?.id,
-			username: user?.username,
-			email: user?.email
+			id: session.user.id,
+			username: session.user.username,
+			email: session.user.email
 		};
-	}
-
-	if (event.route.id) {
-		if (event.route.id.includes('(app)') && !user) return redirect(303, '/');
+	} else {
+		if (event.route.id) {
+			if (event.route.id.includes('(app)')) return redirect(303, '/');
+		}
 	}
 
 	return await resolve(event);
diff --git a/src/lib/config.js b/src/lib/config.js
index 69c9a6e..6b655f4 100644
--- a/src/lib/config.js
+++ b/src/lib/config.js
@@ -1,3 +1,9 @@
 export const COOKIE = '.FILE-UPLOADER-SESSION';
 
-export const MAIL_WHITELIST = ['gmail.com', 'outlook.com', 'madhouselabs.net', 'dfuser.xyz'];
+export const MAIL_WHITELIST = [
+	'gmail.com',
+	'outlook.com',
+	'madhouselabs.net',
+	'dfuser.xyz',
+	'liloandstit.ch'
+];
diff --git a/src/lib/types/user.d.ts b/src/lib/types/user.d.ts
new file mode 100644
index 0000000..88b5b37
--- /dev/null
+++ b/src/lib/types/user.d.ts
@@ -0,0 +1,5 @@
+interface User {
+	id: number;
+	username: string;
+	email: string;
+}
diff --git a/src/routes/(app)/dashboard/+page.svelte b/src/routes/(app)/dashboard/+page.svelte
index 30bce4a..015bebd 100644
--- a/src/routes/(app)/dashboard/+page.svelte
+++ b/src/routes/(app)/dashboard/+page.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { user } from '$lib/stores';
-	import ThemeSwitcher from '$lib/components/ThemeSwitcher.svelte';
+
 	import Button from '$lib/components/Inputs/Button.svelte';
 	import ButtonText from '$lib/components/Inputs/ButtonText.svelte';
 
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index 1841a46..b488150 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -1,4 +1,4 @@
-/** @type {import('@sveltejs/kit').Load} */
+/** @type {import('@sveltejs/kit').ServerLoad} */
 export const load = async ({ locals }) => {
 	return {
 		user: locals.user