refactor: User types

This commit is contained in:
glazk0 2024-04-06 01:00:28 +02:00
parent fadf1f4176
commit 1541813792
No known key found for this signature in database
GPG key ID: E45BF177782B9FEB
2 changed files with 5 additions and 5 deletions

4
src/app.d.ts vendored
View file

@ -10,10 +10,10 @@ declare global {
errorId: string; errorId: string;
} }
interface Locals { interface Locals {
user: User | null; user?: User;
} }
interface PageData { interface PageData {
user: User | null; user?: User;
} }
// interface Platform {} // interface Platform {}
} }

View file

@ -9,7 +9,7 @@ export const handle: Handle = async ({ event, resolve }) => {
const session = event.cookies.get('session'); const session = event.cookies.get('session');
if (!session) { if (!session) {
event.locals.user = null; event.locals.user = undefined;
return resolve(event); return resolve(event);
} }
@ -20,7 +20,7 @@ export const handle: Handle = async ({ event, resolve }) => {
}); });
if (!res.ok) { if (!res.ok) {
event.locals.user = null; event.locals.user = undefined;
event.cookies.delete('session', { path: '/' }); event.cookies.delete('session', { path: '/' });
return resolve(event); return resolve(event);
} }
@ -41,7 +41,7 @@ export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookie
request = new Request(request, { request = new Request(request, {
headers: { headers: {
...request.headers, ...Object.fromEntries(request.headers),
Authorization: `Bearer ${session}` Authorization: `Bearer ${session}`
}, },
}); });