From 64d04ed2f2d270c9824c7435e9b6f7a4b3061f92 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 26 Jul 2024 14:32:41 +0200
Subject: [PATCH] bugfixing

---
 src/hooks.server.ts                            | 17 ++++++++---------
 src/routes/stocks/[tickerID]/+layout.server.ts |  5 ++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 496f816d..0eefb780 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -25,9 +25,9 @@ export const handle = async ({ event, resolve }) => {
 	const userRegion = event?.locals?.region?.split("::")?.at(0)?.split("::")?.at(0) || '';
 
 	// Set a default API URL
-	let pbUrl = import.meta.env.VITE_EU_POCKETBASE_URL; 
-	let apiURL = import.meta.env.VITE_EU_API_URL;
-	let fastifyURL = import.meta.env.VITE_EU_FASTIFY_URL;
+	let pbUrl;
+	let apiURL;
+	let fastifyURL;
 	let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
 
 
@@ -47,20 +47,19 @@ export const handle = async ({ event, resolve }) => {
 	event.locals.pb = new PocketBase(pbUrl);
 	event.locals.pb.authStore.loadFromCookie(event?.request?.headers?.get('cookie') || '');
 
+	event.locals.apiURL = apiURL;
+	event.locals.fastifyURL = fastifyURL;
+	event.locals.apiKey = apiKey;
+
 	try {
 		if (event?.locals?.pb?.authStore?.isValid) {
 			await event?.locals?.pb?.collection('users')?.authRefresh();
 			event.locals.user = serializeNonPOJOs(event?.locals?.pb?.authStore?.model);
-			event.locals.apiURL = apiURL;
-			event.locals.fastifyURL = fastifyURL;
-			event.locals.apiKey = apiKey;
+			
 		}
 	} catch(_) {
 		event?.locals?.pb?.authStore?.clear();
 		event.locals.user = undefined;
-		event.locals.apiURL = apiURL;
-		event.locals.fastifyURL = fastifyURL;
-		event.locals.apiKey = apiKey;
 	}
 
 	
diff --git a/src/routes/stocks/[tickerID]/+layout.server.ts b/src/routes/stocks/[tickerID]/+layout.server.ts
index e155899e..1da6b109 100644
--- a/src/routes/stocks/[tickerID]/+layout.server.ts
+++ b/src/routes/stocks/[tickerID]/+layout.server.ts
@@ -116,9 +116,8 @@ async function fetchCommunitySentiment(pb, ticker, cookies)
 }
 
 export const load = async ({ params, locals, cookies, setHeaders}) => {
-
- 
-    const userRegion = locals?.region?.split("::")[0];
+  
+  const userRegion = locals?.region?.split("::")[0];
 
     let apiURL = locals?.apiURL;
     let fastifyURL = locals?.fastifyURL;