Peer-at-Code/peer-at-code-web
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Interceptors

Browse source
This commit is contained in:
glazk0 2024-04-01 00:32:47 +02:00
parent 7e2d80f971
commit 3c12603404
No known key found for this signature in database
GPG key ID: E45BF177782B9FEB
13 changed files with 86 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/app.d.ts vendored
View file

@ -5,7 +5,10 @@ import type { User } from '$lib/types';
// for information about these interfaces
declare global {
namespace App {
// interface Error {}
interface Error {
message: string;
errorId: string;
}
interface Locals {
user: User | null;
}
@ -16,4 +19,5 @@ declare global {
}
}
export {};
export { };

31
src/hooks.server.ts
View file

@ -1,4 +1,4 @@
import type { Handle } from '@sveltejs/kit';
import type { Handle, HandleFetch, HandleServerError } from '@sveltejs/kit';
import { API_URL } from '$env/static/private';
@ -30,3 +30,32 @@ export const handle: Handle = async ({ event, resolve }) => {
return resolve(event);
};
export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookies } }) => {
const session = cookies.get('session');
if (!session) {
return fetch(request);
}
request = new Request(request, {
headers: {
...request.headers,
Authorization: `Bearer ${session}`
},
});
return fetch(request);
}
export const handleError: HandleServerError = async ({ error, status }) => {
const errorId = crypto.randomUUID();
console.error(`Error ID: ${errorId} - Status: ${status} - ${error}`);
return {
message: 'Whoops!',
errorId,
};
};

10
src/routes/(app)/+page.server.ts
View file

@ -6,17 +6,11 @@ import type { PageServerLoad } from './$types';
import type { Chapter } from '$lib/types';
import { handleRedirect } from '$lib/utils';
export const load = (async ({ url, fetch, cookies, locals: { user } }) => {
export const load = (async ({ url, fetch, locals: { user } }) => {
if (!user) redirect(302, handleRedirect('login', url));
const session = cookies.get('session');
const res = await fetch(`${API_URL}/chapters`, {
headers: {
Authorization: `Bearer ${session}`
}
});
const res = await fetch(`${API_URL}/chapters`);
if (!res.ok) {
return {

10
src/routes/(app)/chapters/+page.server.ts
View file

@ -6,17 +6,11 @@ import type { PageServerLoad } from './$types';
import type { Chapter } from '$lib/types';
import { handleRedirect } from '$lib/utils';
export const load = (async ({ url, locals: { user }, fetch, cookies }) => {
export const load = (async ({ url, locals: { user }, fetch }) => {
if (!user) redirect(302, handleRedirect('login', url));
const session = cookies.get('session');
const res = await fetch(`${API_URL}/chapters`, {
headers: {
Authorization: `Bearer ${session}`
}
});
const res = await fetch(`${API_URL}/chapters`);
if (!res.ok) {
return {

10
src/routes/(app)/chapters/[chapterId]/+page.server.ts
View file

@ -6,17 +6,11 @@ import type { Chapter } from '$lib/types';
import { handleRedirect } from '$lib/utils';
import { redirect } from '@sveltejs/kit';
export const load = (async ({ url, locals: { user }, fetch, cookies, params: { chapterId } }) => {
export const load = (async ({ url, locals: { user }, fetch, params: { chapterId } }) => {
if (!user) redirect(302, handleRedirect('login', url));
const session = cookies.get('session');
const res = await fetch(`${API_URL}/chapter/${chapterId}`, {
headers: {
Authorization: `Bearer ${session}`
}
});
const res = await fetch(`${API_URL}/chapter/${chapterId}`);
if (!res.ok) {
redirect(302, '/chapters');

31
src/routes/(app)/chapters/[chapterId]/groups/+page.server.ts
View file

@ -6,17 +6,11 @@ import type { Chapter, Group } from '$lib/types';
import { handleRedirect } from '$lib/utils';
import { redirect } from '@sveltejs/kit';
export const load: PageServerLoad = async ({ url, locals: { user }, fetch, cookies, params: { chapterId } }) => {
export const load: PageServerLoad = async ({ url, locals: { user }, fetch, params: { chapterId } }) => {
if (!user) redirect(302, handleRedirect('login', url));
const session = cookies.get('session');
let res = await fetch(`${API_URL}/chapter/${chapterId}`, {
headers: {
Authorization: `Bearer ${session}`
}
});
let res = await fetch(`${API_URL}/chapter/${chapterId}`);
if (!res.ok) {
redirect(302, '/chapters');
@ -28,12 +22,7 @@ export const load: PageServerLoad = async ({ url, locals: { user }, fetch, cooki
redirect(302, '/chapters');
}
res = await fetch(`${API_URL}/groups/${chapter.id}`, {
headers:
{
Authorization: `Bearer ${session}`
}
});
res = await fetch(`${API_URL}/groups/${chapter.id}`);
if (!res.ok) {
redirect(302, `/chapters/${chapterId}`);
@ -50,19 +39,14 @@ export const load: PageServerLoad = async ({ url, locals: { user }, fetch, cooki
export const actions: Actions = {
join: async ({ fetch, params: { chapterId }, cookies, request }) => {
join: async ({ fetch, params: { chapterId }, request }) => {
const data = await request.formData();
const name = data.get('name') as string;
const session = cookies.get('session');
const res = await fetch(`${API_URL}/groupJoin`, {
method: 'POST',
headers: {
Authorization: `Bearer ${session}`
},
body: JSON.stringify({
name,
chapter: parseInt(chapterId),
@ -95,19 +79,14 @@ export const actions: Actions = {
message: "Une erreur s'est produite"
};
},
leave: async ({ fetch, params: { chapterId }, cookies, request }) => {
leave: async ({ fetch, params: { chapterId }, request }) => {
const data = await request.formData();
const name = data.get('name') as string;
const session = cookies.get('session');
const res = await fetch(`${API_URL}/groupQuit`, {
method: 'POST',
headers: {
Authorization: `Bearer ${session}`
},
body: JSON.stringify({
name,
chapter: parseInt(chapterId),

7
src/routes/(app)/chapters/[chapterId]/groups/new/+page.server.ts
View file

@ -25,14 +25,12 @@ export const load: PageServerLoad = async ({ url, params: { chapterId }, locals:
};
export const actions: Actions = {
default: async ({ url, locals: { user }, fetch, request, cookies, params: { chapterId } }) => {
default: async ({ url, locals: { user }, fetch, request, params: { chapterId } }) => {
if (!user) redirect(302, handleRedirect('login', url));
if (!chapterId) redirect(302, '/chapters');
const session = cookies.get('session');
const form = await superValidate(request, zod(groupSchema));
if (!form.valid) {
@ -41,9 +39,6 @@ export const actions: Actions = {
const res = await fetch(`${API_URL}/groupCreate`, {
method: 'POST',
headers: {
Authorization: `Bearer ${session}`
},
body: JSON.stringify({
...form.data,
chapter: parseInt(chapterId)

10
src/routes/(app)/chapters/[chapterId]/leaderboard/+page.server.ts
View file

@ -5,19 +5,13 @@ import type { PageServerLoad } from './$types';
import type { LeaderboardEvent } from '$lib/types';
import { handleRedirect } from '$lib/utils';
export const load: PageServerLoad = async ({ url, locals: { user }, fetch, cookies, params: { chapterId } }) => {
export const load: PageServerLoad = async ({ url, locals: { user }, fetch, params: { chapterId } }) => {
if (!user) redirect(302, handleRedirect('login', url));
if (!chapterId) redirect(302, '/');
const session = cookies.get('session');
const res = await fetch(`${API_URL}/leaderboard/${chapterId}`, {
headers: {
Authorization: `Bearer ${session}`
}
});
const res = await fetch(`${API_URL}/leaderboard/${chapterId}`);
if (!res.ok) return {
leaderboard: []

22
src/routes/(app)/chapters/[chapterId]/puzzle/[puzzleId]/+page.server.ts
View file

@ -16,11 +16,7 @@ export const load = (async ({ url, locals: { user }, fetch, cookies, params: { c
redirect(302, `/chapters/${chapterId}`);
}
let res = await fetch(`${API_URL}/chapter/${chapterId}`, {
headers: {
Authorization: `Bearer ${session}`
}
});
let res = await fetch(`${API_URL}/chapter/${chapterId}`);
if (!res.ok) {
redirect(302, `/chapters`);
@ -39,20 +35,22 @@ export const load = (async ({ url, locals: { user }, fetch, cookies, params: { c
redirect(302, `/chapters/${chapterId}`);
}
res = await fetch(`${API_URL}/puzzle/${puzzleId}`, {
headers: {
Authorization: `Bearer ${session}`
}
});
res = await fetch(`${API_URL}/puzzle/${puzzleId}`);
if (!res.ok) {
error(404, 'Puzzle not found');
error(404, {
errorId: 'puzzle_not_found',
message: 'Puzzle not found'
});
}
const puzzle: Puzzle = await res.json();
if (!puzzle) {
error(404, 'Puzzle not found');
error(404, {
errorId: 'puzzle_not_found',
message: 'Puzzle not found'
});
}
const content = await compile(puzzle.content);

10
src/routes/(app)/leaderboard/+page.server.ts
View file

@ -6,17 +6,11 @@ import type { PageServerLoad } from './$types';
import type { Leaderboard } from '$lib/types';
import { handleRedirect } from '$lib/utils';
export const load = (async ({ url, locals: { user }, fetch, cookies }) => {
export const load = (async ({ url, locals: { user }, fetch }) => {
if (!user) redirect(302, handleRedirect('login', url));
const session = cookies.get('session');
const res = await fetch(`${API_URL}/leaderboard`, {
headers: {
Authorization: `Bearer ${session}`
}
});
const res = await fetch(`${API_URL}/leaderboard`);
if (!res.ok) {
return {

10
src/routes/(app)/settings/+layout.svelte
View file

@ -1,5 +1,7 @@
<script lang="ts">
import { page } from '$app/stores';
import { Button } from '$lib/components/ui/button';
import { cn } from '$lib/utils';
let routes = [
{
@ -14,7 +16,13 @@
<ul class="flex gap-2 lg:flex-col">
{#each routes as { name, href } (name)}
<li>
<Button class="w-full" variant="outline" {href}>{name}</Button>
<Button
class={cn('w-full', {
'bg-secondary': $page.url.pathname === href
})}
variant="outline"
{href}>{name}</Button
>
</li>
{/each}
</ul>

7
src/routes/(app)/settings/+page.server.ts
View file

@ -20,12 +20,10 @@ export const load: PageServerLoad = async ({ url, locals: { user } }) => {
};
export const actions: Actions = {
default: async ({ request, cookies, locals: { user } }) => {
default: async ({ request, fetch, locals: { user } }) => {
if (!user) return fail(401);
const session = cookies.get('session');
const form = await superValidate(request, zod(settingSchema));
if (!form.valid) {
@ -34,9 +32,6 @@ export const actions: Actions = {
const res = await fetch(`${API_URL}/user/settings`, {
method: 'POST',
headers: {
Authorization: `Bearer ${session}`
},
body: JSON.stringify({
...form.data
})

14
src/routes/+error.svelte Normal file
View file

@ -0,0 +1,14 @@
<script lang="ts">
import { page } from '$app/stores';
import Button from '$lib/components/ui/button/button.svelte';
</script>
<div class="flex min-h-screen items-center justify-center">
<div class="text-center">
<h1 class="text-6xl font-bold text-red-500">Oops!</h1>
<p class="mt-4 text-xl">Apparement tu as navigué en eau trouble...</p>
<Button class="mt-4" href="/">Retour au port</Button>
<p class="mt-4 text-xs text-muted-foreground">{$page.error?.errorId}</p>
</div>
</div>