From 5d3618a4397f88ed37cd25f39261c3a2bcc2aab7 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 2 Nov 2022 22:45:38 -0700 Subject: move route checks to hooks --- src/hooks.server.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/hooks.server.js') diff --git a/src/hooks.server.js b/src/hooks.server.js index cfe64cbc..510affb6 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -2,20 +2,23 @@ import { auth, get, protectedRoutes } from '$lib/utils'; export async function handle({ event, resolve }) { let token = event.cookies.get('token'); - let { params, url } = event; + let { params, url: { pathname, origin } } = event; let user; - if (token) { + if (token && pathname !== '/logout') { try { user = await get('/me', auth(event.cookies)); event.locals.user = user; + + if (['/login', '/register'].includes(pathname)) + return Response.redirect(origin + `/${user.username}/dashboard`, 307); } catch (e) { - console.log('failed to get user', e); + return Response.redirect(origin + '/logout', 307); } } - if (protectedRoutes.find((p) => url.pathname.match(p))) { - if (user?.username !== params.username) return Response.redirect(url.origin + '/login', 307); + if (protectedRoutes.find((p) => pathname.match(p))) { + if (user?.username !== params.username) return Response.redirect(origin + '/login', 307); } const response = await resolve(event); -- cgit v1.2.3