From 527906b451d9f772e3ccd50e0990f13cfff21f7b Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Sun, 10 Mar 2024 23:19:55 -0700
Subject: [PATCH] Fixing linting issues.

---
 src/hooks.server.ts                           |  5 ++-
 src/lib/components/Header.svelte              | 11 +++---
 src/lib/utils/db/categoryUtils.ts             |  8 ++--
 .../(app)/(protected)/admin/+page.svelte      |  1 +
 .../(protected)/list/[id]/+page.server.ts     | 37 +++++--------------
 .../password/change/+page.server.ts           |  6 +--
 .../(app)/(protected)/profile/+page.server.ts | 11 +++---
 src/routes/(app)/+layout.server.ts            |  1 +
 src/routes/(app)/+layout.svelte               |  2 +
 src/routes/(auth)/+layout.server.ts           |  3 --
 src/routes/(auth)/login/+page.server.ts       |  4 +-
 src/routes/(auth)/logout/+page.server.ts      |  4 +-
 src/routes/(auth)/sign-up/+page.server.ts     |  4 +-
 tsconfig.json                                 |  1 +
 14 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index a7776f0..760ed9d 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -39,11 +39,12 @@ export const authentication: Handle = async function ({ event, resolve }) {
 			...sessionCookie.attributes
 		});
 	}
+	console.log('session from hooks', JSON.stringify(session, null, 2));
 	if (!session) {
 		const sessionCookie = lucia.createBlankSessionCookie();
 		console.log('blank sessionCookie', JSON.stringify(sessionCookie, null, 2));
 		event.cookies.set(sessionCookie.name, sessionCookie.value, {
-			path: ".",
+			path: '.',
 			...sessionCookie.attributes
 		});
 	}
@@ -57,4 +58,4 @@ export const handle: Handle = sequence(
 	// Sentry.sentryHandle(),
 	authentication
 );
-// export const handleError = Sentry.handleErrorWithSentry();
\ No newline at end of file
+// export const handleError = Sentry.handleErrorWithSentry();
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index 1cbe926..60a47bd 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -6,9 +6,11 @@
 	import * as Avatar from "$components/ui/avatar";
 	import { invalidateAll } from '$app/navigation';
 	import Logo from '$components/logo.svelte';
-	import type { Users } from '../../schema';
+	import type { Users } from "../../schema";
 
-	export let user: Users;
+	export let user: Users | null = null;
+
+	console.log('header user', user);
 
 	let avatar: string;
 	let loggedIn = false;
@@ -30,7 +32,7 @@
 	</div>
 	<!-- <TextSearch /> -->
 	<nav>
-		{#if loggedIn}
+		{#if user}
 			<a href="/collection" title="Go to your collection" data-sveltekit-preload-data>Collection</a>
 			<a href="/wishlist" title="Go to your wishlist" data-sveltekit-preload-data>Wishlist</a>
 			<DropdownMenu.Root>
@@ -95,8 +97,7 @@
 					</DropdownMenu.Group>
 				</DropdownMenu.Content>
 			</DropdownMenu.Root>
-		{/if}
-		{#if !loggedIn}
+		{:else}
 			<a href="/login">
 				<span class="flex-auto">Login</span></a
 			>
diff --git a/src/lib/utils/db/categoryUtils.ts b/src/lib/utils/db/categoryUtils.ts
index 07d4cb2..26997ca 100644
--- a/src/lib/utils/db/categoryUtils.ts
+++ b/src/lib/utils/db/categoryUtils.ts
@@ -1,9 +1,9 @@
+import { error } from '@sveltejs/kit';
+import { eq } from 'drizzle-orm';
 import kebabCase from 'just-kebab-case';
+import { PUBLIC_SITE_URL } from '$env/static/public';
 import db from '$lib/drizzle';
 import { externalIds, type Mechanics, type Categories, categories, categoriesToExternalIds } from '../../../schema';
-import { eq } from 'drizzle-orm';
-import { error } from '@sveltejs/kit';
-import { PUBLIC_SITE_URL } from '$env/static/public';
 
 export async function createCategory(locals: App.Locals, category: Categories, externalId: string) {
 	if (!category || !externalId || externalId === '') {
@@ -44,7 +44,7 @@ export async function createCategory(locals: App.Locals, category: Categories, e
 				.insert(categories)
 				.values({
 					name: category.name,
-					slug: kebabCase(category.name || category.slug || '')
+					slug: kebabCase(category.name ?? category.slug ?? '')
 				})
 				.returning();
 			const dbExternalIds = await transaction
diff --git a/src/routes/(app)/(protected)/admin/+page.svelte b/src/routes/(app)/(protected)/admin/+page.svelte
index e69de29..f705a06 100644
--- a/src/routes/(app)/(protected)/admin/+page.svelte
+++ b/src/routes/(app)/(protected)/admin/+page.svelte
@@ -0,0 +1 @@
+<h1>At the admin page yo!</h1>
diff --git a/src/routes/(app)/(protected)/list/[id]/+page.server.ts b/src/routes/(app)/(protected)/list/[id]/+page.server.ts
index 5a9a88f..7a7e196 100644
--- a/src/routes/(app)/(protected)/list/[id]/+page.server.ts
+++ b/src/routes/(app)/(protected)/list/[id]/+page.server.ts
@@ -1,9 +1,10 @@
 import { type Actions, fail, redirect } from "@sveltejs/kit";
-import { and, eq } from "drizzle-orm";
-import db from "$lib/drizzle.js";
-import { superValidate } from 'sveltekit-superforms/server';
-import { games, wishlist_items, wishlists } from "../../../../../schema.js";
+import { eq } from "drizzle-orm";
 import { zod } from "sveltekit-superforms/adapters";
+import { superValidate } from 'sveltekit-superforms/server';
+import db from "$lib/drizzle.js";
+import { modifyListGameSchema } from "$lib/validations/zod-schemas";
+import { games, wishlist_items, wishlists } from "../../../../../schema.js";
 
 export async function load({ params, locals }) {
 	const user = locals.user;
@@ -14,31 +15,16 @@ export async function load({ params, locals }) {
 	try {
 		const wishlist = await db.select({
 			wishlistId: wishlists.id,
-			wishlistName: wishlists.name,
 			wishlistItems: {
 				id: wishlist_items.id,
 				gameId: wishlist_items.game_id,
 				gameName: games.name,
 				gameThumbUrl: games.thumb_url
 			},
-		}).from(wishlists).leftJoin(wishlist_items, eq(wishlists.id, wishlist_items.wishlist_id)).leftJoin(games, eq(games.id, wishlist_items.game_id)).where(eq(wishlists.id, params.id));
-		// let wishlist = await db.query.wishlists.findFirst({
-		// 	where: and(eq(wishlists.id, params.id), eq(wishlists.user_id, user.id)),
-		// 	with: {
-		// 		: {
-		// 			include: {
-		// 				game: {
-		// 					select: {
-		// 						id: true,
-		// 						name: true,
-		// 						thumb_url: true
-		// 					}
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// });
-
+		}).from(wishlists)
+				.leftJoin(wishlist_items, eq(wishlists.id, wishlist_items.wishlist_id))
+				.leftJoin(games, eq(games.id, wishlist_items.game_id))
+				.where(eq(wishlists.id, params.id));
 		return {
 			wishlist
 		};
@@ -69,11 +55,6 @@ export const actions: Actions = {
 		});
 
 		if (!game) {
-			// game = await prisma.game.create({
-			// 	data: {
-			// 		name: form.name
-			// 	}
-			// });
 			return fail(400, {
 				message: 'Game not found'
 			});
diff --git a/src/routes/(app)/(protected)/password/change/+page.server.ts b/src/routes/(app)/(protected)/password/change/+page.server.ts
index f6df6e7..90afba4 100644
--- a/src/routes/(app)/(protected)/password/change/+page.server.ts
+++ b/src/routes/(app)/(protected)/password/change/+page.server.ts
@@ -55,7 +55,7 @@ export const actions: Actions = {
 			where: eq(users.id, user.id)
 		});
 
-		if (!dbUser || !dbUser.hashed_password) {
+		if (!dbUser?.hashed_password) {
 			form.data.password = '';
 			form.data.confirm_password = '';
 			form.data.current_password = '';
@@ -81,8 +81,8 @@ export const actions: Actions = {
 				await db.update(users)
 					.set({ hashed_password: hashedPassword })
 					.where(eq(users.id, user.id));
-				const session = await lucia.createSession(user.id, {
-					country: event.locals.session?.ip,
+				await lucia.createSession(user.id, {
+					country: event.locals.session?.ipCountry ?? 'unknown',
 				});
 				sessionCookie = lucia.createBlankSessionCookie();
 			} catch (e) {
diff --git a/src/routes/(app)/(protected)/profile/+page.server.ts b/src/routes/(app)/(protected)/profile/+page.server.ts
index bd0f2e0..d2327c9 100644
--- a/src/routes/(app)/(protected)/profile/+page.server.ts
+++ b/src/routes/(app)/(protected)/profile/+page.server.ts
@@ -25,14 +25,14 @@ export const load: PageServerLoad = async (event) => {
 
 	const profileForm = await superValidate(zod(profileSchema), {
 		defaults: {
-			firstName: dbUser?.first_name || '',
-			lastName: dbUser?.last_name || '',
-			username: dbUser?.username || '',
+			firstName: dbUser?.first_name ?? '',
+			lastName: dbUser?.last_name ?? '',
+			username: dbUser?.username ?? '',
 		}
 	});
 	const emailForm = await superValidate(zod(changeEmailSchema), {
 		defaults: {
-			email: dbUser?.email || '',
+			email: dbUser?.email ?? '',
 		}
 	});
 
@@ -66,7 +66,6 @@ export const actions: Actions = {
 			console.log('updating profile');
 
 			const user = event.locals.user;
-
 			const newUsername = form.data.username;
 			const existingUser = await db.query
 				.users
@@ -102,7 +101,7 @@ export const actions: Actions = {
 		const form = await superValidate(event, zod(changeEmailSchema));
 
 		const newEmail = form.data?.email;
-		if (!form.valid || !newEmail || (newEmail !== '' && changeEmailIfNotEmpty.safeParse(form.data).success === false)) {
+		if (!form.valid || !newEmail || (newEmail !== '' && !changeEmailIfNotEmpty.safeParse(form.data).success)) {
 			return fail(400, {
 				form
 			});
diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index a4e8697..028bc42 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -2,6 +2,7 @@ import { loadFlash } from 'sveltekit-flash-message/server';
 import type { LayoutServerLoad } from '../$types';
 
 export const load: LayoutServerLoad = loadFlash(async ({ url, locals }) => {
+	console.log('user from app', locals.user);
 	return {
 		url: url.pathname,
 		user: locals.user
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index c0879e8..30eaa47 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -4,6 +4,8 @@
 	import Footer from '$components/Footer.svelte';
 
 	export let data;
+
+	console.log('layout data user', data.user);
 </script>
 
 <Header user={data.user} />
diff --git a/src/routes/(auth)/+layout.server.ts b/src/routes/(auth)/+layout.server.ts
index 78c3b0d..e371530 100644
--- a/src/routes/(auth)/+layout.server.ts
+++ b/src/routes/(auth)/+layout.server.ts
@@ -3,9 +3,6 @@ import { notSignedInMessage } from '$lib/flashMessages';
 
 export async function load(event) {
 	const { url, locals } = event;
-	if (locals.user) {
-		redirect(302, '/', notSignedInMessage, event);
-	}
 
 	return {
 		url: url.pathname,
diff --git a/src/routes/(auth)/login/+page.server.ts b/src/routes/(auth)/login/+page.server.ts
index a21b266..1c0b028 100644
--- a/src/routes/(auth)/login/+page.server.ts
+++ b/src/routes/(auth)/login/+page.server.ts
@@ -77,7 +77,9 @@ export const actions: Actions = {
 				ip_country: locals.country,
 				ip_address: locals.ip
 			});
+			console.log('logging in session', session);
 			sessionCookie = lucia.createSessionCookie(session.id);
+			console.log('logging in session cookie', sessionCookie);
 		} catch (e) {
 			// TODO: need to return error message to the client
 			console.error(e);
@@ -93,6 +95,6 @@ export const actions: Actions = {
 		form.data.username = '';
 		form.data.password = '';
 		const message = { type: 'success', message: 'Signed In!' } as const;
-		redirect('/', message, event);
+		redirect(302, '/', message, event);
 	}
 };
diff --git a/src/routes/(auth)/logout/+page.server.ts b/src/routes/(auth)/logout/+page.server.ts
index 9fdfe9b..49655a5 100644
--- a/src/routes/(auth)/logout/+page.server.ts
+++ b/src/routes/(auth)/logout/+page.server.ts
@@ -1,8 +1,8 @@
 import { fail } from '@sveltejs/kit';
-import { lucia } from '$lib/server/auth';
-import type { Actions } from "./$types";
 import { redirect } from 'sveltekit-flash-message/server';
+import { lucia } from '$lib/server/auth';
 import { notSignedInMessage } from '$lib/flashMessages';
+import type { Actions } from "./$types";
 
 export const actions: Actions = {
 	default: async (event) => {
diff --git a/src/routes/(auth)/sign-up/+page.server.ts b/src/routes/(auth)/sign-up/+page.server.ts
index 808915a..c3eca08 100644
--- a/src/routes/(auth)/sign-up/+page.server.ts
+++ b/src/routes/(auth)/sign-up/+page.server.ts
@@ -23,7 +23,7 @@ const signUpDefaults = {
 };
 
 export const load: PageServerLoad = async (event) => {
-	redirect(302, '/waitlist', { type: 'error', message: 'Sign-up not yet available. Please add your email to the waitlist!' }, event);
+	// redirect(302, '/waitlist', { type: 'error', message: 'Sign-up not yet available. Please add your email to the waitlist!' }, event);
 
 	if (event.locals.user) {
 		const message = { type: 'success', message: 'You are already signed in' } as const;
@@ -39,7 +39,7 @@ export const load: PageServerLoad = async (event) => {
 
 export const actions: Actions = {
 	default: async (event) => {
-		fail(401, { message: 'Sign-up not yet available. Please add your email to the waitlist!' });
+		// fail(401, { message: 'Sign-up not yet available. Please add your email to the waitlist!' });
 		const form = await superValidate(event, zod(signUpSchema));
 		if (!form.valid) {
 			form.data.password = '';
diff --git a/tsconfig.json b/tsconfig.json
index 6ae0c8c..7b98d09 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,7 @@
 		"checkJs": true,
 		"esModuleInterop": true,
 		"forceConsistentCasingInFileNames": true,
+		"useUnknownInCatchVariables": true,
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
 		"sourceMap": true,