From 1b3accf009e859f6098c659cdbed695e5b17b641 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 27 Feb 2023 10:30:10 -0800 Subject: don't redirect homepage --- src/hooks.server.js | 32 -------------------------------- src/routes/(app)/+layout.server.js | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/hooks.server.js (limited to 'src') diff --git a/src/hooks.server.js b/src/hooks.server.js deleted file mode 100644 index 4107ec86..00000000 --- a/src/hooks.server.js +++ /dev/null @@ -1,32 +0,0 @@ -import { auth, get, protectedRoutes } from '$lib/utils'; - -export async function handle({ event, resolve }) { - let token = event.cookies.get('token'); - let { - params, - request, - url: { pathname, origin } - } = event; - - let user; - if (token && pathname !== '/logout') { - try { - user = await get('/me', auth(event.cookies)); - event.locals.user = user; - - if (['/', '/login', '/register'].includes(pathname) && request.method === 'GET') - return Response.redirect(origin + `/${user.username}/dashboard`, 307); - } catch (e) { - return Response.redirect(origin + '/logout', 307); - } - } - - if (protectedRoutes.find((p) => pathname.match(p))) { - if (!user || user.username !== params.username) - return Response.redirect(origin + '/login', 307); - } - - const response = await resolve(event); - - return response; -} diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js index 881dbccc..ef278744 100644 --- a/src/routes/(app)/+layout.server.js +++ b/src/routes/(app)/+layout.server.js @@ -19,7 +19,7 @@ export async function load({ cookies, request, url, params }) { throw redirect(307, `/migrate`); } - if (user && ['/', '/login', '/register'].includes(pathname) && request.method === 'GET') { + if (user && ['/login', '/register'].includes(pathname) && request.method === 'GET') { throw redirect(307, `/${user.username}`); } -- cgit v1.2.3