-
-
- {#if confirmation}
-
Confirmation
-
- {:else}
-
Inscription
-
+
+{:else}
+
Confirmation
+
+
-
+
+
+ {#if $formConfirmationDelayed}
+
+ {/if}
+ Confirmer
+
+
+{/if}
+
+
+ {#snippet link({ href, name }: { href: string; name: string })}
+ -
+
+ {name}
+
+
+ {/snippet}
+ {#each links as { href, name }}
+ {@render link({ href, name })}
+ {/each}
+
diff --git a/src/routes/(auth)/register/schema.ts b/src/routes/(auth)/register/schema.ts
new file mode 100644
index 0000000..65a1e07
--- /dev/null
+++ b/src/routes/(auth)/register/schema.ts
@@ -0,0 +1,25 @@
+import { z } from 'zod';
+
+// export const CODE_REGEX = /^[0-9a-f]{4}-[0-9a-f]{4}$/;
+
+export const formSchema = z.object({
+ email: z.string().email({ message: 'Email invalide' }),
+ firstname: z.string().nonempty({ message: "Prénom requis" }),
+ lastname: z.string().nonempty({ message: "Nom requis" }),
+ pseudo: z.string().nonempty({ message: "Nom d'utilisateur requis" }),
+});
+
+export type FormSchema = typeof formSchema;
+
+export const formConfirmationSchema = z.object({
+ ...formSchema.shape,
+ passwd: z.string().nonempty({ message: 'Mot de passe requis' }),
+ confirm: z.string().nonempty({ message: 'Confirmation du mot de passe requise' }),
+ code: z.string().nonempty({ message: 'Confirmation du mot de passe requise' }),
+
+}).refine((data) => data.passwd == data.confirm, {
+ message: 'Les mots de passe ne correspondent pas',
+ path: ['confirm']
+});
+
+export type FormConfirmationSchema = typeof formConfirmationSchema;
diff --git a/src/routes/(auth)/reset-password/+page.server.ts b/src/routes/(auth)/reset-password/+page.server.ts
index 7c94b8b..96293a9 100644
--- a/src/routes/(auth)/reset-password/+page.server.ts
+++ b/src/routes/(auth)/reset-password/+page.server.ts
@@ -1,91 +1,91 @@
-import { dev } from '$app/environment';
-import { API_URL } from '$env/static/private';
+import { dev } from "$app/environment";
+import { API_URL } from "$env/static/private";
-import { fail, redirect } from '@sveltejs/kit';
+import type { Actions, PageServerLoad } from "./$types";
-import type { Actions, PageServerLoad } from './$types';
+import { redirect } from "@sveltejs/kit";
-import { zod } from 'sveltekit-superforms/adapters';
-import { setError, superValidate } from 'sveltekit-superforms/server';
+import { fail, setError, superValidate } from "sveltekit-superforms";
+import { zod } from "sveltekit-superforms/adapters";
-import { requestPasswordResetSchema, resetPasswordSchema } from '$lib/validations/auth';
+import { COOKIES } from "$lib/constants";
-export const load: PageServerLoad = async ({ locals: { user } }) => {
- if (user) redirect(302, '/');
+import { formConfirmationSchema, formSchema } from "./schema";
- const requestPasswordResetForm = await superValidate(zod(requestPasswordResetSchema));
- const resetPasswordForm = await superValidate(zod(resetPasswordSchema));
+export const load: PageServerLoad = async ({ locals }) => {
+ if (locals.user) {
+ redirect(302, "/");
+ }
- return {
- title: 'Réinitialisation de mot de passe',
- requestPasswordResetForm,
- resetPasswordForm
- };
-}
+ return {
+ form: await superValidate(zod(formSchema)),
+ formConfirmation: await superValidate(zod(formConfirmationSchema))
+ }
+};
export const actions: Actions = {
- request: async ({ request, fetch }) => {
- const form = await superValidate(request, zod(requestPasswordResetSchema));
+ request: async ({ request, fetch }) => {
+ const form = await superValidate(request, zod(formSchema));
- if (!form.valid) {
- return fail(400, { form });
- }
+ if (!form.valid) {
+ return fail(400, { form });
+ }
- const res = await fetch(`${API_URL}/user/fpw`, {
- method: 'POST',
- body: JSON.stringify({
- email: form.data.email
- })
- });
+ const res = await fetch(API_URL + '/user/fpw', {
+ method: 'POST',
+ body: JSON.stringify({
+ email: form.data.email
+ })
+ });
- if (!res.ok) {
- return setError(form, 'email', "Une erreur s'est produite ou l'email n'existe pas");
- }
+ if (!res.ok) {
+ return setError(form, 'email', "Une erreur s'est produite ou l'email n'existe pas");
+ }
- return {
- form
- }
- },
- confirmation: async ({ request, cookies, fetch, url: { searchParams } }) => {
- const form = await superValidate(request, zod(resetPasswordSchema));
+ return {
+ form
+ }
+ },
+ confirmation: async ({ request, cookies, fetch, url: { searchParams } }) => {
+ const form = await superValidate(request, zod(formConfirmationSchema));
- if (!form.valid) {
- return fail(400, { form });
- }
+ if (!form.valid) {
+ return fail(400, { form });
+ }
- const res = await fetch(`${API_URL}/user/fpw`, {
- method: 'POST',
- body: JSON.stringify({
- email: form.data.email,
- password: form.data.password,
- code: form.data.code
- })
- });
+ const res = await fetch(`${API_URL}/user/fpw`, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: form.data.email,
+ password: form.data.password,
+ code: form.data.code
+ })
+ });
- if (!res.ok) {
- if (res.status === 400) {
- return setError(form, 'code', "Le code de confirmation est incorrect");
- }
+ if (!res.ok) {
+ if (res.status === 400) {
+ return setError(form, 'code', "Le code de confirmation est incorrect");
+ }
- return setError(form, 'code', "Une erreur est survenue, veuillez réessayer plus tard");
- }
+ return setError(form, 'code', "Une erreur est survenue, veuillez réessayer plus tard");
+ }
- const token = res.headers.get('Authorization')?.split('Bearer ').pop();
+ const token = res.headers.get('Authorization')?.split('Bearer ').pop();
- if (!token) {
- return setError(form, 'code', "Une erreur est survenue, veuillez réessayer plus tard");
- }
+ if (!token) {
+ return setError(form, 'code', "Une erreur est survenue, veuillez réessayer plus tard");
+ }
- cookies.set('session', token, {
- path: '/',
- secure: !dev,
- sameSite: 'strict'
- });
+ cookies.set(COOKIES.SESSION, token, {
+ path: '/',
+ secure: !dev,
+ sameSite: 'strict'
+ });
- const redirectTo = searchParams.get('redirectTo');
+ const redirectTo = searchParams.get('redirectTo');
- if (redirectTo) redirect(302, `/${redirectTo.slice(1)}`);
+ if (redirectTo) redirect(302, `/${redirectTo.slice(1)}`);
- redirect(302, '/');
- }
-}
+ redirect(302, '/');
+ }
+};
diff --git a/src/routes/(auth)/reset-password/+page.svelte b/src/routes/(auth)/reset-password/+page.svelte
index 675b16e..05177f7 100644
--- a/src/routes/(auth)/reset-password/+page.svelte
+++ b/src/routes/(auth)/reset-password/+page.svelte
@@ -1,184 +1,178 @@
-
-
-
- {#if confirmation}
-
Confirmation
-
-
- -
- Se connecter
-
- {#if confirmation}
- -
-
-
- {/if}
-
- {:else}
-
Changer le mot de passe
-
-
+
+{:else}
+
Confirmation
+
+
-
+
+
+ {#if $formConfirmationDelayed}
+
+ {/if}
+ Confirmer
+
+
+{/if}
+
+
+ {#snippet link({ href, name }: { href: string; name: string })}
+ -
+
+ {name}
+
+
+ {/snippet}
+ {#each links as { href, name }}
+ {@render link({ href, name })}
+ {/each}
+
diff --git a/src/routes/(auth)/reset-password/schema.ts b/src/routes/(auth)/reset-password/schema.ts
new file mode 100644
index 0000000..19aaeb8
--- /dev/null
+++ b/src/routes/(auth)/reset-password/schema.ts
@@ -0,0 +1,19 @@
+import { z } from 'zod';
+
+export const formSchema = z.object({
+ email: z.string().email({ message: 'Email invalide' })
+});
+
+export type FormSchema = typeof formSchema;
+
+export const formConfirmationSchema = z.object({
+ email: z.string().email({ message: 'Email invalide' }),
+ password: z.string().nonempty({ message: 'Mot de passe requis' }),
+ confirm: z.string().nonempty({ message: 'Confirmation du mot de passe requise' }),
+ code: z.string().nonempty({ message: 'Code de confirmation requis' })
+}).refine((data) => data.password == data.confirm, {
+ message: 'Les mots de passe ne correspondent pas',
+ path: ['confirm']
+});
+
+export type FormConfirmationSchema = typeof formConfirmationSchema;
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 1bdfb20..270d756 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,5 +1,5 @@
@@ -9,6 +9,6 @@
Oops!
Apparement tu as navigué en eau trouble...
-
Error ID: {$page.error?.errorId}
+
Error ID: {page.error?.errorId}
+