diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts index cb6a9f1..615b854 100644 --- a/src/auth/auth.controller.ts +++ b/src/auth/auth.controller.ts @@ -14,7 +14,6 @@ import { import { AuthGuard } from './auth.guard'; import { AuthService } from './auth.service'; import { registerDto } from './dto/registerDto.dto'; -import { UserDto } from 'src/users/dto/userDto.dto'; @Controller('auth') export class AuthController { @@ -37,16 +36,14 @@ export class AuthController { return req.user; } - @UseGuards(AuthGuard) @Put('Modificacion/:id') - async update(@Param('id') id: number, @Body() updateUserDto: Record) { - return this.authService.update(id, updateUserDto); + async update(@Param('id') userId: number, @Body() updateUserDto: Record) { + return this.authService.update(userId, updateUserDto); } - @UseGuards(AuthGuard) - @Delete('Borrado/:id') - async remove(@Param('id') id: number) { - await this.authService.remove(id); + @Delete(':id') + async remove(@Param('id') userId: number) { + await this.authService.remove(userId); return { message: 'User successfully deleted' }; } diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index 801ab29..6a2e42c 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -66,6 +66,14 @@ export class AuthService { } async update(userId, updateUserDto) { + + const{contraseña}=updateUserDto; + + if(contraseña){ + const hashedpassword = await hash(contraseña, 10); + updateUserDto = {...updateUserDto,contraseña:hashedpassword}; + } + return await this.userRepository.update(userId, updateUserDto); } diff --git a/src/users/users.service.ts b/src/users/users.service.ts index bf6736b..9b17aa0 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -14,20 +14,6 @@ export class UsersService { async findOne(usuario: string): Promise { return this.users.findOne({ where: { usuario } }); } - - async create(user: User): Promise { - const newUser = this.users.create(user); - return this.users.save(newUser); - } - - //async update(userId: number, updateUserDto: UserDto): Promise { - //return await this.users.update(userId, updateUserDto); - //} - - async remove(userId: number): Promise { - await this.users.delete(userId); - } - async updateTokenAndDates( id: number, token: string,