Merge pull request #18 from fga-eps-mds/72-password-email

72 password email

src/auth/auth.controller.ts

@@ -113,15 +113,6 @@ export class AuthController {
 
  @Put('reset-password')
  async resetPassword(@Body() resetPasswordDto: ResetPasswordDto) {
- if (resetPasswordDto.newPassword !== resetPasswordDto.confirmPassword) {
- throw new UnauthorizedException('Passwords are not the same');
- }
-
- await this.authService.resetPassword(
- resetPasswordDto.newPassword,
- resetPasswordDto.resetToken,
- );
-
- return { message: 'Password reset successful' };
+ return this.authService.resetPassword(resetPasswordDto);
  }
 }

src/auth/auth.service.ts

@@ -18,6 +18,7 @@ import { EmailService } from 'src/users/email.service';
 import { ResetToken } from 'src/users/interface/reset-token.schema';
 import { Response } from 'express';
 import { ConfigService } from '@nestjs/config';
+import { ResetPasswordDto } from 'src/users/dtos/reset-password.dto';
 
 @Injectable()
 export class AuthService {
@@ -180,23 +181,23 @@ export class AuthService {
  async forgotPassword(email: string) {
  const user = await this.userModel.findOne({ email });
 
- if (user) {
- const expiryDate = new Date();
- expiryDate.setHours(expiryDate.getHours() + 1);
-
- const resetToken = nanoid(64);
- await this.ResetTokenModel.create({
- token: resetToken,
- userId: user._id,
- expiryDate,
- });
- this.emailService.sendPasswordResetEmail(email, resetToken);
+ if (!user) {
+ throw new NotFoundException('User not found');
  }
+ const expiryDate = new Date();
+ expiryDate.setHours(expiryDate.getHours() + 1);
+ const resetToken = nanoid(64);
+ await this.ResetTokenModel.create({
+ token: resetToken,
+ userId: user._id,
+ expiryDate,
+ });
+ this.emailService.sendPasswordResetEmail(email, resetToken);
 
- return { message: 'If this user exists, they will receive an email' };
+ return { message: 'Check your email, you will receive an redirect link' };
  }
 
- async resetPassword(newPassword: string, resetToken: string) {
+ async resetPassword({newPassword, resetToken}: ResetPasswordDto) {
  const token = await this.ResetTokenModel.findOneAndDelete({
  token: resetToken,
  expiryDate: { $gte: new Date() },
@@ -208,10 +209,10 @@ export class AuthService {
 
  const user = await this.userModel.findById(token.userId);
  if (!user) {
- throw new InternalServerErrorException();
+ throw new NotFoundException('User not found...');
  }
-
  user.password = newPassword;
  await user.save();
+ return { message: 'Password reset successful' };
  }
 }

src/users/dtos/reset-password.dto.ts

@@ -10,11 +10,4 @@ export class ResetPasswordDto {
  message: 'Password must contain at least one number',
  })
  newPassword: string;
-
- @IsString()
- @MinLength(6)
- @Matches(/^(?=.*[0-9])/, {
- message: 'Password must contain at least one number',
- })
- confirmPassword: string;
 }

src/users/email.service.ts

@@ -1,12 +1,13 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import * as nodemailer from 'nodemailer';
 import * as sgTransport from 'nodemailer-sendgrid-transport';
 
 @Injectable()
 export class EmailService {
  private transporter: nodemailer.Transporter;
 
- constructor() {
+ constructor(private readonly configService: ConfigService) {
  this.transporter = nodemailer.createTransport(
  sgTransport({
  auth: {
@@ -103,7 +104,7 @@ export class EmailService {
  }
 
  async sendPasswordResetEmail(to: string, token: string): Promise<void> {
- const resetLink = `http://yourapp.com/reset-password?token=${token}`;
+ const resetLink = `${this.configService.get<string>('FRONTEND_URL')}/reset-password?token=${token}`;
  const mailOptions = {
  from: process.env.EMAIL_USER,
  to: to,