From edf23bdbaa110946f4ee3a15ebfd859169785b48 Mon Sep 17 00:00:00 2001
From: Peaceultime <clem31470@gmail.com>
Date: Tue, 30 Jul 2024 23:25:47 +0200
Subject: [PATCH] Registration completed

---
 .gitignore                       |   2 +
 assets/common.css                |  19 ++++++-
 bun.lockb                        | Bin 347136 -> 347136 bytes
 components/Input.vue             |   7 ++-
 composables/useAuth.ts           |  88 +++++++++++++++++++++++--------
 db.sqlite                        | Bin 69632 -> 69632 bytes
 middleware/auth.ts               |   4 +-
 nuxt.config.ts                   |   3 +-
 pages/user/register.vue          |  56 +++++++++++++-------
 schemas/registration.ts          |   3 ++
 server/api/auth/login.post.ts    |   1 +
 server/api/auth/register.post.ts |  81 ++++++++++++++++++----------
 12 files changed, 191 insertions(+), 73 deletions(-)

diff --git a/.gitignore b/.gitignore
index 66f00b6..c62c698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ logs
 .env
 .env.*
 !.env.example
+
+db.sqlite-*
\ No newline at end of file
diff --git a/assets/common.css b/assets/common.css
index 7922b2d..96583a8 100644
--- a/assets/common.css
+++ b/assets/common.css
@@ -192,13 +192,19 @@ html.light-mode .light-block {
 
 .input-form.input-form-wide {
     width: 600px;
+    min-height: 300px;
+    justify-content: center;
+    align-items: stretch;
 }
 
 .input-form {
     width: 400px;
+    min-height: 200px;
+    justify-content: center;
+    align-items: center;
     display: flex;
     flex-direction: column;
-    padding: 0 2em 2em 2em;
+    padding: 2em 2em 2em 2em;
     border: 1px solid var(--background-modifier-border);
 }
 
@@ -209,6 +215,7 @@ html.light-mode .light-block {
 }
 
 .input-form h1 {
+    margin-top: 0px;
     font-size: x-large;
 }
 
@@ -253,4 +260,14 @@ html.light-mode .light-block {
 
 .password-validation-item.validation-error {
     color: var(--text-error);
+}
+
+.input-form .loading {
+    width: 24px;
+    height: 24px;
+    border: 4px solid var(--color-purple);
+    border-right-color: transparent;
+    border-radius: 50%;
+    box-sizing: content-box;
+    animation: rotate 1s linear infinite;
 }
\ No newline at end of file
diff --git a/bun.lockb b/bun.lockb
index 996f7023f183c9ae15eb786cde59b640474d29b9..04cd812944758a4ba047b05b40c7170bea7ffccc 100644
GIT binary patch
delta 71
zcmZpeA=&^$EsQNpTbQ@jvoppS>KW>pweP8C-oB@vWy)y<XY;R0xn0+LCh{>ds4y@z
VFhBukR@L*@f8WiXezBZs0swVO8A<>E

delta 71
zcmZpeA=&^$EsQNpTbQ@jvokS(LHnM1=IwjxS*Dy;IJ3`0X#dBzw<hv2GN>>xG(Z$E
TFz84puX^*X@%i+N<xCR*SM(UJ

diff --git a/components/Input.vue b/components/Input.vue
index b0eeeea..321d562 100644
--- a/components/Input.vue
+++ b/components/Input.vue
@@ -6,12 +6,15 @@ interface Prop
 }
 const props = defineProps<Prop>();
 const model = defineModel<string>();
+
+const err = ref<string | boolean | undefined>(props.error);
 </script>
 
 <template>
     <div class="input-group">
         <label v-if="title" class="input-label">{{ title }}</label>
-        <input class="input-input" :class="{'input-has-error': !!error}" v-model="model" v-bind="$attrs" />
-        <span v-if="error && typeof error === 'string'" class="input-error">{{ error }}</span>
+        <input @input="err = false" class="input-input" :class="{ 'input-has-error': !!err }" v-model="model"
+            v-bind="$attrs" />
+        <span v-if="err && typeof err === 'string'" class="input-error">{{ err }}</span>
     </div>
 </template>
\ No newline at end of file
diff --git a/composables/useAuth.ts b/composables/useAuth.ts
index d2efa9d..a82456c 100644
--- a/composables/useAuth.ts
+++ b/composables/useAuth.ts
@@ -6,49 +6,91 @@ export interface Auth
 {
     id: Ref<number>;
     data: Ref<Record<string, any>>;
-    token: Ref<string>;
-    session_id: Ref<number>;
+    sessionId: Ref<string>;
     status: Ref<AuthStatus>;
 
     lastRefresh: Ref<Date>;
 
-    register: (username: string, email: string, password: string, data?: Record<string, any>) => AuthStatus;
-    login: (usernameOrEmail: string, password: string) => AuthStatus;
-    logout: () => AuthStatus;
+    register: (username: string, email: string, password: string, data?: Record<string, any>) => Promise<any>;
+    login: (usernameOrEmail: string, password: string) => Promise<void>;
+    logout: () => Promise<void>;
 
-    refresh: () => AuthStatus;
+    refresh: () => Promise<void>;
 }
 
-const id = useState<number>("auth:id", () => 0);
-const data = useState<any>("auth:data", () => {});
-const token = useState<string>("auth:token", () => '');
-const session_id = useState<number>("auth:session_id", () => 0);
-const status = useState<AuthStatus>("auth:status", () => 0);
 
-const lastRefresh = useState<Date>("auth:date", () => new Date());
+async function register(username: string, email: string, password: string, additionalData?: Record<string, any>): Promise<any>
+{
+    const id = useState<number>("auth:id");
+    const data = useState<any>("auth:data");
+    const sessionId = useState<string>("auth:sessionId");
+    const status = useState<AuthStatus>("auth:status");
+    const lastRefresh = useState<Date>("auth:date");
+    status.value = AuthStatus.loading;
 
-function register(username: string, email: string, password: string, data?: Record<string, any>): AuthStatus
-{
-    
-    return AuthStatus.disconnected;
+    try
+    {
+        const result = await $fetch("/api/auth/register", {
+            method: 'POST',
+            body: { username, email, password, additionalData },
+            ignoreResponseError: true,
+        });
+
+        if(result.success)
+        {
+            id.value = result.id!;
+            data.value = { ...additionalData, username: username, email: email };
+            sessionId.value = result.sessionId!;
+            status.value = AuthStatus.connected;
+            lastRefresh.value = new Date();
+
+            return;
+        }
+        else if(result.error)
+        {
+            status.value = AuthStatus.disconnected;
+            
+            return result.error;
+        }
+        else
+        {
+            status.value = AuthStatus.disconnected;
+
+            return;
+        }
+    }
+    catch(e) { 
+        console.log(JSON.stringify(e));
+        status.value = AuthStatus.disconnected; 
+    }
 }
-function login(usernameOrEmail: string, password: string): AuthStatus
+async function login(usernameOrEmail: string, password: string): Promise<void>
 {
-    return AuthStatus.disconnected;
+    const status = useState<AuthStatus>("auth:status");
+    status.value = AuthStatus.disconnected;
 }
-function logout(): AuthStatus
+async function logout(): Promise<void>
 {
-    return AuthStatus.disconnected;
+    const status = useState<AuthStatus>("auth:status");
+    status.value = AuthStatus.disconnected;
 }
 
-function refresh(): AuthStatus
+async function refresh(): Promise<void>
 {
-    return AuthStatus.disconnected;
+    const status = useState<AuthStatus>("auth:status");
+    status.value = AuthStatus.disconnected;
 }
 
 export default function useAuth(): Auth {
+    const id = useState<number>("auth:id", () => 0);
+    const data = useState<any>("auth:data", () => { });
+    const sessionId = useState<string>("auth:sessionId", () => '');
+    const status = useState<AuthStatus>("auth:status", () => AuthStatus.disconnected);
+
+    const lastRefresh = useState<Date>("auth:date", () => new Date());
+
     return {
-        id, data, token, session_id, status, lastRefresh,
+        id, data, sessionId, status, lastRefresh,
         register, login, logout, refresh
     };
 }
\ No newline at end of file
diff --git a/db.sqlite b/db.sqlite
index 3d36073c900cb31d2c31b22ca0f7ba6ee3d29fd2..fee7ba934dc6feeda8d7b07ff477cadf164b4552 100644
GIT binary patch
delta 843
zcmbV|%~I1)6vywSNov}rxAkMHpaVvrRT&F3DjheJ5)lUZEEd?rG+feX+Cq~sI4*?3
zUTPjd_AVSJ58wl^z@0uq7mm|~G6TcHODaRfopa~R+;i^lp8x-xja_PEm)dCyvjBiF
z2}FV-(OvCHK(_k4o%_K$?0R6$J<mQ>MdnRqvE3Vq$KkeO$~heyt9ni{abZPrQ>pTZ
zuMBiGi1t&W(j9XvTdz+mfBg~8Hxa1xjF`%Z9hub7xY)rry$4T3C4ujV`B+|CvZqn2
zo%eRewH2Pti1V2qQkGR*G|y69Hq05kT*gM8XGbS8;)poo?0NHW)c*m9k!TcdGdx4a
z1|WHpi9C%$pcR+!I#Jb3EXkJ1bTLfq4-q|2B=0a0`=kE>9ZcSKZ!!DWhkTV*GBfGD
zW!PC(v}e)P|M6+>d6gEi&3+#ocBcJZkV>7XZTc?13o!P6AaqTT`kS`XSWYll0_i5`
ziXip<1JTZL09|tYgNMkWdVj?)K+C{ogXSE#bBIC!w9qZUM|J|y5kN;y_)8sKq&*PQ
zH0M@x0Oio46An!vKSMEq<2bO{M%(!9uwoix)<Ra!W)rh<Sru1{uhL`bf%M~Xp)@*a
zjnC(X#N||}Tuv?vow|^EvM^WfS7)cxd~q&e4UH*+aevX$*78enbD(?|kGz~yC#@Ii
znH}_#2-nc{6GIf$u+@0215`(K;*cf8H^fIg3ChDk3VCk9DJ(14(oL;^-5~%O6CDul
wJF*Wx2breaIoJ>NGBto|s78RV=!V;cbc2eH3yD7AVeg<?kTw0DQYz5D0XEL)1poj5

delta 714
zcmZozz|ydQWrDOI8v_G_AQ1BdF$)k&PSi1GWSf{E&+E%|fom#PEeP_2Z59+rW8-SF
zlwlXw*Jo@|oXpQIDr8(-n3EJ=lA2o(Uy_)VlNxV4*^FJD-B?LMgNsvX@&pc%$#(qw
zlWW)&?2A*2i!<}{;xiJ9Gn6<(Tq8mh{QQA9)W=5$s5Y|zi(q1UYF-IMeDi7c3`P~M
zS_Ua`b#=xTX0Uao#i>oE5C=8s0%?$p<m4Zmu9K&52vE!B$*0+qWw=)}NQCM$GGykZ
zq*eeuomr9^pIBOwZz;znK6yR287rTqESRM+`93E<ldJUP`Ft*$1G!ZhC*S1ZGd7IJ
z2q{BBzI=v0Y-T!2vx$f5PZs2sn0%c_K-MVU5IvNQc!7F3fN{mJ`411j@Mhr$SNSI{
zP}pSfQ=gq57$`->hMNRf6xbN~lNk7ufH4=&&(hc^%{V!=-z6eS+qE>k%)=zD#K_0Y
z)iA^$&?sEr(k<N0z%<!hJIf?5z%4jSJ3qh7#X_YpqAVjj)WY4!#K*ZHF{MzuBsapu
zJUBDU(Z$fYI3&N^&CAi$Ak)myCy;A1W5Q2<F;-?~W=>8npwk%nKQaIjh{*|b!UKLO
zem-Vp&Vba!<kZrflFZyxUa+cf4E*1K@^APjf7{OobTXX3`P+E`1D2Nz{4ash_xL5m
b#h8sblXFsYjSWrA4II*Q6Ek!4lJj!`Byh?V

diff --git a/middleware/auth.ts b/middleware/auth.ts
index fde17fc..8ad1e51 100644
--- a/middleware/auth.ts
+++ b/middleware/auth.ts
@@ -1,5 +1,7 @@
 export default defineNuxtRouteMiddleware((to) => {
 	const meta = to.meta.auth;
 
-	//to.
+	//useSession(to.)
+
+	return to;
 })
\ No newline at end of file
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 364e4ab..890aefb 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -5,7 +5,8 @@ export default defineNuxtConfig({
   modules: [CanvasModule, "@nuxt/content", "@nuxtjs/color-mode"],
   css: ['~/assets/common.css', '~/assets/global.css'],
   runtimeConfig: {
-    dbFile: ''
+    dbFile: '',
+    sessionPassword: '699c46bd-9aaa-4364-ad01-510ee4fe7013'
   },
   components: [
     {
diff --git a/pages/user/register.vue b/pages/user/register.vue
index d58189a..3d7fb87 100644
--- a/pages/user/register.vue
+++ b/pages/user/register.vue
@@ -16,7 +16,7 @@ const state = reactive<Registration>({
 
 const confirmPassword = ref("");
 
-const { status, signUp } = useAuth();
+const { status, register } = useAuth();
 
 const checkedLength = computed(() => state.password.length >= 8 && state.password.length <= 128);
 const checkedLowerUpper = computed(() => state.password.toLowerCase() !== state.password && state.password.toUpperCase() !== state.password);
@@ -26,17 +26,23 @@ const checkedSymbol = computed(() => " !\"#$%&'()*+,-./:;<=>?@[]^_`{|}~".split("
 const usernameError = ref("");
 const emailError = ref("");
 
-function register(): void
+async function submit()
 {
     const data = schema.safeParse(state);
 
     if(data.success && state.password !== "" && confirmPassword.value === state.password)
     {
-        try {
-            signUp({ ...data.data }, { redirect: true, callbackUrl: '/' });
-        } catch(e) {
-            usernameError.value = e?.data?.find(e => e.path.includes("username"))?.message ?? "";
-            emailError.value = e?.data?.find(e => e.path.includes("email"))?.message ?? "";
+        let errors = await register(data.data.username, data.data.email, data.data.password, {});
+
+        if(status.value === AuthStatus.connected)
+        {
+            await navigateTo('/');
+        }
+        else
+        {
+            errors = errors?.issues ?? errors;
+            usernameError.value = errors?.find((e: any) => e.path.includes("username"))?.message ?? "";
+            emailError.value = errors?.find((e: any) => e.path.includes("email"))?.message ?? "";
         }
     }
     else
@@ -48,27 +54,41 @@ function register(): void
 </script>
 
 <template>
+
     <Head>
         <Title>S'inscrire</Title>
     </Head>
     <div class="site-body-center-column">
         <div class="render-container flex align-center justify-center">
-            <form v-if="status === 'unauthenticated'"  @submit.prevent="register" class="input-form input-form-wide">
+            <form v-if="status === AuthStatus.disconnected" @submit.prevent="submit" class="input-form input-form-wide">
                 <h1>Inscription</h1>
-                <Input type="text" v-model="state.username" placeholder="Entrez un nom d'utiliateur" title="Nom d'utilisateur" :error="usernameError"/>
-                <Input type="text" v-model="state.email" placeholder="Entrez une addresse mail" title="Adresse mail" :error="emailError"/>
-                <Input type="password" v-model="state.password" placeholder="Entrez un mot de passe" title="Mot de passe" :error="!(checkedLength && checkedLowerUpper && checkedDigit && checkedSymbol)"/>
+                <Input type="text" autocomplete="username" v-model="state.username"
+                    placeholder="Entrez un nom d'utiliateur" title="Nom d'utilisateur" :error="usernameError" />
+                <Input type="text" autocomplete="email" v-model="state.email" placeholder="Entrez une addresse mail"
+                    title="Adresse mail" :error="emailError" />
+                <Input type="password" autocomplete="new-password" v-model="state.password"
+                    placeholder="Entrez un mot de passe" title="Mot de passe"
+                    :error="!(checkedLength && checkedLowerUpper && checkedDigit && checkedSymbol)" />
                 <div class="password-validation-group">
-                    <span class="password-validation-title">Votre mot de passe doit respecter les critères suivants :</span>
-                    <span class="password-validation-item" :class="{'validation-error': !checkedLength}">Entre 8 et 128 caractères</span>
-                    <span class="password-validation-item" :class="{'validation-error': !checkedLowerUpper}">Au moins une minuscule et une majuscule</span>
-                    <span class="password-validation-item" :class="{'validation-error': !checkedDigit}">Au moins un chiffre</span>
-                    <span class="password-validation-item" :class="{'validation-error': !checkedSymbol}">Au moins un caractère spécial parmis la liste suivante: <pre>! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ ] ^ _ ` { | } ~</pre></span>
+                    <span class="password-validation-title">Votre mot de passe doit respecter les critères suivants
+                        :</span>
+                    <span class="password-validation-item" :class="{'validation-error': !checkedLength}">Entre 8 et 128
+                        caractères</span>
+                    <span class="password-validation-item" :class="{'validation-error': !checkedLowerUpper}">Au moins
+                        une minuscule et une majuscule</span>
+                    <span class="password-validation-item" :class="{'validation-error': !checkedDigit}">Au moins un
+                        chiffre</span>
+                    <span class="password-validation-item" :class="{'validation-error': !checkedSymbol}">Au moins un
+                        caractère spécial parmis la liste suivante:
+                        <pre>! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ ] ^ _ ` { | } ~</pre>
+                    </span>
                 </div>
-                <Input type="password" v-model="confirmPassword" placeholder="Confirmer le mot de passe" title="Confirmer le mot de passe" :error="confirmPassword === '' || confirmPassword === state.password ? '' : 'Les mots de passe saisies ne sont pas identique'"/>
+                <Input type="password" v-model="confirmPassword" placeholder="Confirmer le mot de passe"
+                    title="Confirmer le mot de passe"
+                    :error="confirmPassword === '' || confirmPassword === state.password ? '' : 'Les mots de passe saisies ne sont pas identique'" />
                 <button>Valider</button>
             </form>
-            <div v-else-if="status === 'loading'"></div>
+            <div v-else-if="status === AuthStatus.loading" class="input-form"><div class="loading"></div></div>
             <div v-else class="not-found-container">
                 <div class="not-found-title">👀 Vous n'avez rien à faire ici. 👀</div>
             </div>
diff --git a/schemas/registration.ts b/schemas/registration.ts
index d4184f1..8b775a6 100644
--- a/schemas/registration.ts
+++ b/schemas/registration.ts
@@ -38,6 +38,9 @@ export const schema = z.object({
     username: z.string({ required_error: "Nom d'utilisateur obligatoire" }).min(3, "Votre nom d'utilisateur doit contenir au moins 3 caractères").max(32, "Votre nom d'utilisateur doit contenir au plus 32 caractères"),
     email: z.string({ required_error: "Email obligatoire" }).email("Adresse mail invalide"),
     password: z.string({ required_error: "Mot de passe obligatoire" }).min(8, "Votre mot de passe doit contenir au moins 8 caractères").max(128, "Votre mot de passe doit contenir au moins 8 caractères").superRefine(securePassword),
+    data: z.object({
+
+    }).partial().nullish(),
 });
 
 export type Registration = z.infer<typeof schema>; 
\ No newline at end of file
diff --git a/server/api/auth/login.post.ts b/server/api/auth/login.post.ts
index 0e2f809..05ffd3b 100644
--- a/server/api/auth/login.post.ts
+++ b/server/api/auth/login.post.ts
@@ -1,2 +1,3 @@
 export default defineEventHandler(async (e) => {
+    
 });
\ No newline at end of file
diff --git a/server/api/auth/register.post.ts b/server/api/auth/register.post.ts
index 4df29af..4f8ae46 100644
--- a/server/api/auth/register.post.ts
+++ b/server/api/auth/register.post.ts
@@ -2,34 +2,61 @@ import useDatabase from '~/composables/useDatabase';
 import { schema } from '~/schemas/registration';
 
 export default defineEventHandler(async (e) => {
-    const body = await readValidatedBody(e, schema.safeParse);
-
-    if(!body.success)
-        return body.error;
-
-    const db = useDatabase();
-
-    const usernameQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE username = ?1`);
-    const checkUsername = usernameQuery.get(body.data.username);
-
-    const emailQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE email = ?1`);
-    const checkEmail = emailQuery.get(body.data.email);
-
-    const errors = [];
-    if(checkUsername.count !== 0)
-        errors.push({ path: ['username'], message: "Ce nom d'utilisateur est déjà utilisé" });
-    if(checkEmail.count !== 0)
-        errors.push({ path: ['email'], message: "Cette adresse mail est déjà utilisée" });
-
-    if(errors.length > 0)
-        throw createError({ status: 406, message: "duplicates", data: errors });
-    else
+    try
     {
-        const hash = await Bun.password.hash(body.data.password);
-        const registration = db.query(`INSERT INTO users(username, email, hash) VALUES(?1, ?2, ?3)`);
-        const result = registration.get(body.data.username, body.data.email, hash);
+        const { sessionPassword } = useRuntimeConfig();
+        const body = await readValidatedBody(e, schema.safeParse);
 
-        setResponseStatus(e, 201, "Created");
-        return { success: true };
+        if (!body.success)
+        {
+            setResponseStatus(e, 406);
+            return { success: false, error: body.error };
+        }
+
+        const db = useDatabase();
+
+        const usernameQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE username = ?1`);
+        const checkUsername = usernameQuery.get(body.data.username) as any;
+
+        const emailQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE email = ?1`);
+        const checkEmail = emailQuery.get(body.data.email) as any;
+
+        const errors = [];
+        if(checkUsername.count !== 0)
+            errors.push({ path: ['username'], message: "Ce nom d'utilisateur est déjà utilisé" });
+        if(checkEmail.count !== 0)
+            errors.push({ path: ['email'], message: "Cette adresse mail est déjà utilisée" });
+
+        if(errors.length > 0)
+        {
+            setResponseStatus(e, 406);
+            return { success: false, error: errors };
+        }
+        else
+        {
+            const hash = await Bun.password.hash(body.data.password);
+            const registration = db.query(`INSERT INTO users(username, email, hash, email_valid) VALUES(?1, ?2, ?3, 0)`);
+            registration.get(body.data.username, body.data.email, hash) as any;
+
+            const userIdQuery = db.query(`SELECT id FROM users WHERE username = ?1`);
+            const id = (userIdQuery.get(body.data.username) as any).id;
+
+            const registeringData = db.query(`INSERT INTO users_data(user_id) VALUES(?1)`);
+            registeringData.get(id);
+            
+            const session = await useSession(e, {
+                password: sessionPassword,
+            });
+
+            const loggingIn = db.query(`INSERT INTO user_sessions(id, user_id, ip, agent, lastRefresh) VALUES(?1, ?2, ?3, ?4, ?5)`);
+            loggingIn.get(session.id, id, getRequestIP(e), getRequestHeader(e, 'User-Agent'), Date.now());
+
+            setResponseStatus(e, 201);
+            return { success: true, id: id, sessionId: session.id };
+        }
+    }
+    catch(e)
+    {
+        return { success: false, error: e };
     }
 });
\ No newline at end of file