Merge branch 'master' of github.com:coinos/coinos-ui-v2

1 files changed, 3 insertions, 7 deletions

diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index e110b467..be81e19f 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -1,12 +1,12 @@
 import { error, redirect } from '@sveltejs/kit';
-import cookie from 'cookie';
 import { protectedRoutes } from '$lib/utils';
 import { get, post, auth } from '$lib/utils';
 import { env } from '$env/dynamic/public';
 
 export const { PUBLIC_BTC: btc } = env;
 
-export async function load({ cookies, request, url, params }) {
+export async function load({ cookies, locals, request, url, params }) {
+	url.pathname;
 	let token = cookies.get('token');
 	let user;
 	let rates;
@@ -17,11 +17,7 @@ export async function load({ cookies, request, url, params }) {
 	}
 
 	if (token && token !== 'undefined') {
-		try {
-			user = await get('/me', auth(cookies));
-		} catch (e) {
-			throw redirect(307, '/logout');
-		}
+		user = locals.user;
 
 		if (protectedRoutes.find((p) => url.pathname.match(p))) {
 			if (user.username !== params.username) throw error(404, 'user not found');