From 3058fe2ea268fd88010f6a925d32dac140bf2284 Mon Sep 17 00:00:00 2001
From: Nathan Lamy <nathan.lamycharrier@gmail.com>
Date: Thu, 21 Aug 2025 18:46:29 +0200
Subject: [PATCH] feat: improve auth flow

---
 app/controllers/auth_controller.ts | 19 +++++++++++++------
 app/validators/auth.ts             |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/auth_controller.ts b/app/controllers/auth_controller.ts
index 7e80c7b..e7ff2dc 100644
--- a/app/controllers/auth_controller.ts
+++ b/app/controllers/auth_controller.ts
@@ -6,6 +6,7 @@ import { inject } from '@adonisjs/core'
 import app from '@adonisjs/core/services/app'
 import env from '#start/env'
 import User from '#models/user'
+import { DateTime } from 'luxon'
 
 @inject()
 export default class AuthController {
@@ -89,9 +90,16 @@ export default class AuthController {
       }
     }
 
+    const lastYear = DateTime.now().minus({ years: 1 })
     return User.query()
-      .select('firstName', 'lastName')
+      .select('firstName', 'lastName', 'id')
       .where('className', className)
+      .whereExists((query) => {
+        query
+          .from('colles')
+          .whereRaw('colles.student_id = users.id')
+          .where('colles.date', '>=', lastYear.toISODate())
+      })
       .orderBy('lastName', 'asc')
       .then((users) => {
         return {
@@ -99,6 +107,7 @@ export default class AuthController {
           data: users.map((user) => ({
             value: `${user.firstName}::${user.lastName}`,
             label: user.fullName,
+            userId: user.id,
           })),
         }
       })
@@ -106,12 +115,11 @@ export default class AuthController {
 
   // POST /auth/register
   async register({ request, response, auth }: HttpContext) {
-    const { name, className, token } = await request.validateUsing(registerValidator)
+    const { userId, className, token } = await request.validateUsing(registerValidator)
 
     // Validate token
     const { success, email } = this.authService.validateToken(token)
-    const [firstName, lastName] = name.split('::')
-    if (!success || !email || !firstName || !lastName) {
+    if (!success || !email) {
       return response.badRequest({
         success: false,
         message: 'Votre lien de connexion est invalide ou a expiré.',
@@ -119,8 +127,7 @@ export default class AuthController {
     }
 
     const user = await User.query()
-      .where('firstName', firstName)
-      .where('lastName', lastName)
+      .where('id', userId)
       .where('className', className)
       .first()
     if (!user) {
diff --git a/app/validators/auth.ts b/app/validators/auth.ts
index 72653f6..7dc8e29 100644
--- a/app/validators/auth.ts
+++ b/app/validators/auth.ts
@@ -21,7 +21,7 @@ export const verifyCodeValidator = vine.compile(
 
 export const registerValidator = vine.compile(
   vine.object({
-    name: vine.string().minLength(2).maxLength(50).trim(),
+    userId: vine.number().positive(),
     className: vine.string().minLength(2).maxLength(50),
     token: vine.string(),
   })