fix error on invalide session cookie

codercatdev · codercatdev · commit 4b80de881c64 · 2023-04-12T20:20:36.000-04:00
diff --git a/apps/codingcatdev/src/routes/(protected)/+layout.server.ts b/apps/codingcatdev/src/routes/(protected)/+layout.server.ts
@@ -1,21 +1,27 @@
 import { ccdValidateSessionCookie } from '$lib/server/firebase';
-import { redirect } from '@sveltejs/kit';
+import { redirect, error } from '@sveltejs/kit';
 import type { LayoutServerLoad } from './$types';
 
 export const load = (async ({ cookies, url }) => {
-    const ccdsession = cookies.get('session');
+    try {
+        const ccdsession = cookies.get('session');
 
-    if (!ccdsession) {
-        throw redirect(307, `/login?redirectTo=${url.pathname}`);
-    }
+        if (!ccdsession) {
+            throw redirect(307, `/login?redirectTo=${url.pathname}`);
+        }
 
-    const decodedClaims = await ccdValidateSessionCookie(ccdsession);
+        const decodedClaims = await ccdValidateSessionCookie(ccdsession);
 
-    if (!decodedClaims) {
+        if (!decodedClaims) {
+            throw redirect(307, `/login?redirectTo=${url.pathname}`);
+        }
+
+        return {
+            user: decodedClaims
+        };
+    } catch (error) {
+        cookies.set('session', "", { expires: new Date(0) });
+        console.error(error);
         throw redirect(307, `/login?redirectTo=${url.pathname}`);
     }
-
-    return {
-        user: decodedClaims
-    };
 }) satisfies LayoutServerLoad;
diff --git a/apps/codingcatdev/src/routes/+layout.server.ts b/apps/codingcatdev/src/routes/+layout.server.ts
@@ -2,12 +2,21 @@ import { ccdValidateSessionCookie } from '$lib/server/firebase';
 import type { LayoutServerLoad } from './$types';
 
 export const load = (async ({ cookies }) => {
-	const ccdsession = cookies.get('session');
-	if (!ccdsession) {
-		return {};
+	try {
+
+		const ccdsession = cookies.get('session');
+		if (!ccdsession) {
+			return {};
+		}
+		const decodedClaims = await ccdValidateSessionCookie(ccdsession);
+		return {
+			user: decodedClaims
+		};
+	} catch (error) {
+		cookies.set('session', "", { expires: new Date(0) });
+
+		console.error(error)
+		return {
+		};
 	}
-	const decodedClaims = await ccdValidateSessionCookie(ccdsession);
-	return {
-		user: decodedClaims
-	};
 }) satisfies LayoutServerLoad;
diff --git a/apps/codingcatdev/src/routes/login/+page.server.ts b/apps/codingcatdev/src/routes/login/+page.server.ts
@@ -1,4 +1,4 @@
-import { ccdCreateSessionCookie, ccdValidateSessionCookie } from '$lib/server/firebase';
+import { ccdCreateSessionCookie } from '$lib/server/firebase';
 import type { Actions, PageServerLoad } from './$types';
 import { fail, redirect } from '@sveltejs/kit'
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ccdCreateSessionCookie, ccdValidateSessionCookie } from '$lib/server/firebase';`
	`1`	`+import { ccdCreateSessionCookie } from '$lib/server/firebase';`
`2`	`2`	`import type { Actions, PageServerLoad } from './$types';`
`3`	`3`	`import { fail, redirect } from '@sveltejs/kit'`
`4`	`4`