fix: updates based on pr feedback

ThatConference · Oct 17, 2023 · e46da2b · e46da2b
1 parent e86a88e
commit e46da2b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 26 deletions.
diff --git a/src/routes/(admin sponsor)/sponsor-admin/leads/[eventId]/+page.server.js b/src/routes/(admin sponsor)/sponsor-admin/leads/[eventId]/+page.server.js
@@ -1 +1,5 @@
-// This file ensures hooks.server.js is run whenever this route is accessed
+/* This empty page is intentional
+ * having this +page.server page here forces the hooks.server handler to execute
+ * regardless if page.svelte is fully loaded or not
+ * https://github.com/sveltejs/kit/issues/6315
+ */
diff --git a/src/routes/(root)/login/+page.svelte b/src/routes/(root)/login/+page.svelte
diff --git a/src/routes/(root)/login/+page.server.js → src/routes/(root)/login/+server.js b/src/routes/(root)/login/+page.server.js → src/routes/(root)/login/+server.js
@@ -1,8 +1,9 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect, error } from '@sveltejs/kit';
+import * as Sentry from '@sentry/sveltekit';
 
-export async function load({ fetch, locals, url }) {
+export async function GET({ fetch, locals, url }) {
 	const returnTo = url.searchParams?.get('returnTo') || '/';
-	let _url = '';
+	let _url = '/';
 	try {
 		const session = await locals.getSession();
 		if (!session?.user) {
@@ -30,7 +31,8 @@ export async function load({ fetch, locals, url }) {
 			}
 		}
 	} catch (err) {
-		console.error(err);
+		Sentry.setContext('error', { err });
+		throw error(500, 'Authentication Login Error');
 	}
 
 	if (_url) {

diff --git a/src/routes/(root)/logout/+page.svelte b/src/routes/(root)/logout/+page.svelte
diff --git a/src/routes/(root)/logout/+page.server.js → src/routes/(root)/logout/+server.js b/src/routes/(root)/logout/+page.server.js → src/routes/(root)/logout/+server.js
@@ -1,7 +1,8 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect, error } from '@sveltejs/kit';
+import * as Sentry from '@sentry/sveltekit';
 
-export async function load({ fetch, locals, url }) {
-	let _url = '';
+export async function GET({ fetch, locals, url }) {
+	let _url = '/';
 	try {
 		const session = await locals.getSession();
 
@@ -30,7 +31,8 @@ export async function load({ fetch, locals, url }) {
 			}
 		}
 	} catch (err) {
-		console.error('Error during logout:', err);
+		Sentry.setContext('error', { err });
+		throw error(500, 'Authentication Logout Error');
 	}
 
 	if (_url) {

diff --git a/src/routes/(root)/sign-up/+page.server.js → src/routes/(root)/sign-up/+server.js b/src/routes/(root)/sign-up/+page.server.js → src/routes/(root)/sign-up/+server.js
@@ -1,7 +1,8 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect, error } from '@sveltejs/kit';
+import * as Sentry from '@sentry/sveltekit';
 
-export async function load({ fetch, locals }) {
-	let _url = '';
+export async function GET({ fetch, locals }) {
+	let _url = '/';
 	try {
 		const session = await locals.getSession();
 		if (!session?.user) {
@@ -32,7 +33,8 @@ export async function load({ fetch, locals }) {
 			}
 		}
 	} catch (err) {
-		console.error(err);
+		Sentry.setContext('error', { err });
+		throw error(500, 'Authentication Sign-up Error');
 	}
 
 	if (_url) {

diff --git a/src/routes/(root)/speakers/+layout.server.js b/src/routes/(root)/speakers/+layout.server.js
@@ -1 +1,4 @@
-// pages forces hooks.server.js to execute when page is fully hydrated and loaded
+/* This empty page is intentional
+ * having this +layout.server page here forces the hooks.server handler to execute
+ * https://github.com/sveltejs/kit/issues/6315
+ */