From ab1d5694b077cef4aaec94051b8a45185e56b4fd Mon Sep 17 00:00:00 2001
From: Nabilsenko <96882497+Nabilsenko@users.noreply.github.com>
Date: Thu, 2 Feb 2023 16:45:24 +0100
Subject: [PATCH] fix: fixed hash
---
src/login/login.module.ts | 2 +-
src/people/dao/people.dao.ts | 32 +++++++++++++++++---------------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/login/login.module.ts b/src/login/login.module.ts
index c31f30a..d7ab1bb 100644
--- a/src/login/login.module.ts
+++ b/src/login/login.module.ts
@@ -15,7 +15,7 @@ import { JwtStrategy } from './jwt.strategy';
PassportModule,
JwtModule.register({
secret: jwtConstants.secret,
- signOptions: { expiresIn: '3600s' },
+ signOptions: { expiresIn: '300s' },
}),
],
controllers: [LoginController],
diff --git a/src/people/dao/people.dao.ts b/src/people/dao/people.dao.ts
index 65d909a..33fd035 100644
--- a/src/people/dao/people.dao.ts
+++ b/src/people/dao/people.dao.ts
@@ -25,21 +25,23 @@ export class PeopleDao {
private readonly _peopleModel: Model<People>,
) {}
- login = async (email: string, password: string): Promise<People | void> => {
- try {
- const user = await this._peopleModel.findOne({ email });
- if (!user) {
- throw new NotFoundException('Email or password is incorrect!');
- }
- const isPasswordCorrect = await bcrypt.compare(password, user.passwordHash);
- if (!isPasswordCorrect) {
- throw new NotFoundException('Email or password is incorrect!');
- }
- return user;
- } catch (error) {
- throw error;
- }
- };
+ login = (email: string, password: string): Promise<People | void> =>
+ new Promise(async (resolve, reject) => {
+ this._peopleModel.findOne({ email: email }, async (err, value) => {
+ if (err) reject(err.message);
+ if (!value)
+ reject(new NotFoundException('Email or password is incorrect!'));
+ const isPasswordCorrect = await bcrypt.compare(
+ password,
+ value.passwordHash,
+ );
+ if (!isPasswordCorrect) {
+ reject(new NotFoundException('Email or password is incorrect!'));
+ }
+ value.passwordHash = password
+ resolve(value);
+ });
+ });
find = (): Promise<People[]> =>
new Promise((resolve, reject) => {
--
GitLab