From 0bdce7973943ef886b7ff6a0ad5312a158cf63a3 Mon Sep 17 00:00:00 2001 From: dimitar Date: Tue, 25 Feb 2025 21:22:50 +0100 Subject: [PATCH] clean up --- backend/src/admin/admin.module.ts | 3 ++- backend/src/admin/admin.service.ts | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/backend/src/admin/admin.module.ts b/backend/src/admin/admin.module.ts index fc45aa6..47db664 100644 --- a/backend/src/admin/admin.module.ts +++ b/backend/src/admin/admin.module.ts @@ -4,10 +4,11 @@ import { AdminService } from './admin.service'; import { PrismaModule } from '../prisma/prisma.module'; import { S3Module } from '../s3/s3.module'; import { EmailModule } from '../email/email.module'; +import { AuthModule } from '../auth/auth.module'; @Module({ controllers: [AdminController], providers: [AdminService], - imports: [PrismaModule, S3Module, EmailModule], + imports: [PrismaModule, S3Module, EmailModule, AuthModule], }) export class AdminModule {} diff --git a/backend/src/admin/admin.service.ts b/backend/src/admin/admin.service.ts index 98ae256..8583751 100644 --- a/backend/src/admin/admin.service.ts +++ b/backend/src/admin/admin.service.ts @@ -5,6 +5,7 @@ import { UpdateDocumentDto } from '../dto/update-document.dto'; import { CreateUserDto } from '../dto/create-user.dto'; import * as bcrypt from 'bcrypt'; import { EmailService } from '../email/email.service'; +import { AuthService } from '../auth/auth.service'; @Injectable() export class AdminService { @@ -14,6 +15,7 @@ export class AdminService { private readonly prisma: PrismaService, private readonly s3Service: S3Service, private readonly emailService: EmailService, + private readonly authService: AuthService, ) {} async getAllDocuments() { @@ -45,14 +47,8 @@ export class AdminService { } async createUser(createUserDto: CreateUserDto) { - const hashedPassword = await bcrypt.hash(createUserDto.password, 10); - - return this.prisma.user.create({ - data: { - ...createUserDto, - password: hashedPassword, - }, - }); + this.logger.log('Delegating user creation to AuthService'); + return this.authService.createUser(createUserDto, createUserDto.isAdmin); } async updateDocument(