auth correction

src/routes/auth/auth.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, Post } from '@nestjs/common';
 import { LoginDto } from '../user/dto/login.dto';
 import { AuthService } from './auth.service';
-import { CreateUserDto } from '../user/dto/create_user.dto';
 import { Public } from 'src/common/decorators/public.decorator';
+import { RegisterDto } from '../user/dto/register.dto';
 
 @Controller('auth')
 export class AuthController {
@@ -15,8 +15,8 @@ export class AuthController {
     }
 
     @Public()
-    @Post('bootstrap-super-admin')
+    @Post('register')
-    async bootstrapSuperAdmin(@Body() dto: CreateUserDto) {
+    async register(@Body() dto: RegisterDto) {
-        return this.authService.bootstrapSuperAdmin(dto);
+        return this.authService.register(dto);
     }
 }

src/routes/auth/auth.service.ts

@@ -1,33 +1,123 @@
-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import {
+    ConflictException,
+    Injectable,
+    UnauthorizedException,
+} from '@nestjs/common';
 import { UserService } from '../user/user.service';
 import { JwtService } from '@nestjs/jwt';
-import { RoleType } from 'src/entities/users.entity';
 import * as bcrypt from 'bcrypt';
+import { RegisterDto } from '../user/dto/register.dto';
+import { ConfigService } from '@nestjs/config';
+import { RoleType, StatutUtilisateurType } from 'src/entities/users.entity';
+import { LoginDto } from '../user/dto/login.dto';
 
 @Injectable()
 export class AuthService {
     constructor(
-        private readonly userService: UserService,
+        private readonly usersService: UserService,
         private readonly jwtService: JwtService,
+        private readonly configService: ConfigService,
     ) { }
 
-    async bootstrapSuperAdmin(dto: any) {
+    /**
-        const user = await this.userService.create({
+     * Génère un access_token et un refresh_token
-            ...dto,
+     */
-            role: RoleType.SUPER_ADMIN,
+    async generateTokens(userId: string, email: string, role: RoleType) {
-        }, undefined);
+        const [accessToken, refreshToken] = await Promise.all([
-        return { message: 'Super admin cree avec succes !', user };
+            this.jwtService.signAsync(
+                { sub: userId, email, role },
+                {
+                    secret: this.configService.get<string>('jwt.secret'),
+                    expiresIn: this.configService.get<string>('jwt.access_token_expires'),
+                },
+            ),
+            this.jwtService.signAsync(
+                { sub: userId },
+                {
+                    secret: this.configService.get<string>('jwt.refresh_token_secret'),
+                    expiresIn: this.configService.get<string>(
+                        'jwt.refresh_token_expires',
+                    ),
+                },
+            ),
+        ]);
+
+        return {
+            access_token: accessToken,
+            refresh_token: refreshToken,
+        };
     }
 
-    async login({ email, password }: { email: string, password: string }) {
+    /**
-        const user = await this.userService.findByEmail(email)
+     * Connexion utilisateur
-        if (!user) throw new UnauthorizedException('Identifiants invalides !');
+     */
+    async login(dto : LoginDto) {
+        const user = await this.usersService.findByEmail(dto.email);
+
+        // Vérification du mot de passe
+        const isMatch = await bcrypt.compare(dto.password, user.password_hash);
+        if (!isMatch) {
+            throw new UnauthorizedException('Identifiants invalides');
+        }
+
+        return this.generateTokens(user.id, user.email, user.role);
+    }
+
+    /**
+     * Rafraîchir les tokens
+     */
+    async refreshTokens(refreshToken: string) {
+        try {
+            const payload = await this.jwtService.verifyAsync(refreshToken, {
+                secret: this.configService.get<string>('jwt.refresh_token_secret'),
+            });
+
+            const user = await this.usersService.findOne(payload.sub);
+            if (!user) {
+                throw new UnauthorizedException('Utilisateur introuvable');
+            }
+
+            return this.generateTokens(user.id, user.email, user.role);
+        } catch {
+            throw new UnauthorizedException('Refresh token invalide');
+        }
+    }
+
+    /**
+     * Inscription utilisateur lambda (parent ou assistante maternelle)
+     */
+    async register(registerDto: RegisterDto) {
+        // Vérifier si l'email existe déjà
+        const exists = await this.usersService.findByEmail(registerDto.email).catch(() => null);
+        if (exists) {
+            throw new ConflictException('Email déjà utilisé');
+        }
+
+        // Filtrer les rôles autorisés
+        const allowedRoles = new Set<RoleType>([RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE]);
+        if (!allowedRoles.has(registerDto.role)) {
+            registerDto.role = RoleType.PARENT;
+        }
+
+        // Statut par défaut
+        registerDto.status = StatutUtilisateurType.EN_ATTENTE;
+
+        // Création de l'utilisateur (UserService gère le hash)
+        const user = await this.usersService.create(registerDto);
+
+        // Génération des tokens
+        const tokens = await this.generateTokens(user.id, user.email, user.role);
 
-        const isMatch = await bcrypt.compare(password, user.password_hash);
-        if (!isMatch) throw new UnauthorizedException('Identifiants invalides !');
-        const payload = { id: user.id, email: user.email, role: user.role };
         return {
-            access_token: this.jwtService.sign(payload),
+            ...tokens,
+            user: {
+                id: user.id,
+                email: user.email,
+                role: user.role,
+                first_name: user.first_name,
+                last_name: user.last_name,
+                status: user.status,
+            },
         };
     }
 }