4 files changed, 49 insertions, 10 deletions
diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index e28d8b56..8b694241 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -1,4 +1,4 @@
-import { auth, get, sleep } from "$lib/utils";
+import { auth, get, isInvalidTokenError, sleep } from "$lib/utils";
 import { error, redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, request, url, params }) {
@@ -12,8 +12,21 @@ export async function load({ cookies, request, url, params }) {
 			user = await get("/me", auth(cookies));
 		} catch (e) {
 			const { message } = e as Error;
-			if (message.startsWith("Rate")) await sleep(3000);
-			user = await get("/me", auth(cookies));
+			if (message.startsWith("Rate")) {
+				await sleep(3000);
+				try {
+					user = await get("/me", auth(cookies));
+				} catch (retryError) {
+					if (isInvalidTokenError(retryError) && pathname !== "/logout") {
+						redirect(307, "/logout");
+					}
+					throw retryError;
+				}
+			} else if (isInvalidTokenError(e) && pathname !== "/logout") {
+				redirect(307, "/logout");
+			} else {
+				throw e;
+			}
 		}
 	}
 
diff --git a/src/routes/(app)/admin/+layout.server.ts b/src/routes/(app)/admin/+layout.server.ts
index d4aa181d..a2da1a90 100644
--- a/src/routes/(app)/admin/+layout.server.ts
+++ b/src/routes/(app)/admin/+layout.server.ts
@@ -1,10 +1,16 @@
-import { auth, get } from "$lib/utils";
+import { auth, get, isInvalidTokenError } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies }) {
 	const token = cookies.get("token");
 	if (!token) redirect(307, "/login");
-	const user = await get("/me", auth(cookies));
+	let user;
+	try {
+		user = await get("/me", auth(cookies));
+	} catch (e) {
+		if (isInvalidTokenError(e)) redirect(307, "/logout");
+		throw e;
+	}
 	if (!user) redirect(307, "/login");
 
 	return { user };
diff --git a/src/routes/(static)/+layout.server.ts b/src/routes/(static)/+layout.server.ts
index c780b5e0..5de752fa 100644
--- a/src/routes/(static)/+layout.server.ts
+++ b/src/routes/(static)/+layout.server.ts
@@ -1,4 +1,5 @@
-import { get, auth } from "$lib/utils";
+import { auth, get, isInvalidTokenError } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies }) {
 	const token = cookies.get("token");
@@ -7,7 +8,11 @@ export async function load({ cookies }) {
 	if (token) {
 		try {
 			user = await get("/me", auth(cookies));
-		} catch (e) {}
+		} catch (e) {
+			if (isInvalidTokenError(e)) {
+				redirect(307, "/logout");
+			}
+		}
 	}
 
 	return { user };
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 584e836c..c1f77695 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -3,7 +3,8 @@ import {
 	loadTranslations,
 	locales,
 } from "$lib/translations/index";
-import { auth, get, sleep } from "$lib/utils";
+import { auth, get, isInvalidTokenError, sleep } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export const load = async ({ cookies, request, url }) => {
 	const { host, pathname } = url;
@@ -13,8 +14,22 @@ export const load = async ({ cookies, request, url }) => {
 		try {
 			user = await get("/me", auth(cookies));
 		} catch (e) {
-			if (e.message.startsWith("Rate")) await sleep(3000);
-			user = await get("/me", auth(cookies));
+			const { message } = e as Error;
+			if (message.startsWith("Rate")) {
+				await sleep(3000);
+				try {
+					user = await get("/me", auth(cookies));
+				} catch (retryError) {
+					if (isInvalidTokenError(retryError) && pathname !== "/logout") {
+						redirect(307, "/logout");
+					}
+					throw retryError;
+				}
+			} else if (isInvalidTokenError(e) && pathname !== "/logout") {
+				redirect(307, "/logout");
+			} else {
+				throw e;
+			}
 		}
 	}