Markdown editor in progress + Login and session process completed

server/api/auth/register.post.ts

@@ -1,41 +1,67 @@
+import { ZodError, ZodIssue } from 'zod';
 import useDatabase from '~/composables/useDatabase';
 import { schema } from '~/schemas/registration';
+import { checkSession, logSession } from '~/server/utils/user';
+import { UserSession, UserSessionRequired } from '~/types/auth';
 
-export default defineEventHandler(async (e) => {
+interface SuccessHandler
+{
+    success: true;
+    session: UserSession;
+}
+interface ErrorHandler
+{
+    success: false;
+    error: Error | ZodError<{
+        username: string;
+        email: string;
+        password: string;
+    }>;
+}
+type Return = SuccessHandler | ErrorHandler;
+
+export default defineEventHandler(async (e): Promise<Return> => {
     try
     {
-        const { sessionPassword } = useRuntimeConfig();
+        const session = await getUserSession(e);
+        const db = useDatabase();
+
+        const checkedSession = await checkSession(e, session);
+
+        if(checkedSession !== undefined)
+            return checkedSession;
+
         const body = await readValidatedBody(e, schema.safeParse);
 
         if (!body.success)
         {
+            await clearUserSession(e);
+
             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 = [];
+        const errors: ZodIssue[] = [];
         if(checkUsername.count !== 0)
-            errors.push({ path: ['username'], message: "Ce nom d'utilisateur est déjà utilisé" });
+            errors.push({ code: 'custom', 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" });
+            errors.push({ code: 'custom', path: ['email'], message: "Cette adresse mail est déjà utilisée" });
 
         if(errors.length > 0)
         {
             setResponseStatus(e, 406);
-            return { success: false, error: errors };
+            return { success: false, error: new ZodError(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)`);
+            const registration = db.query(`INSERT INTO users(username, email, hash, state) 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`);
@@ -43,20 +69,18 @@ export default defineEventHandler(async (e) => {
 
             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());
+            logSession(e, await setUserSession(e, { user: { id: id, username: body.data.username, email: body.data.email, state: 0 } }) as UserSessionRequired);
 
             setResponseStatus(e, 201);
-            return { success: true, id: id, sessionId: session.id };
+            return { success: true, session };
         }
     }
-    catch(e)
+    catch(err: any)
     {
-        return { success: false, error: e };
+        await clearUserSession(e);
+
+        console.error(err);
+        return { success: false, error: err as Error };
     }
 });