diff --git a/src/Controllers/UserCotroller.ts b/src/Controllers/UserCotroller.ts index 5fb7b711c2cabe28192eb1a662106c49a0892197..c1ab0aadacf69b4a01aaf6c92c3227bcca2ce80f 100644 --- a/src/Controllers/UserCotroller.ts +++ b/src/Controllers/UserCotroller.ts @@ -46,6 +46,7 @@ const create = async (req: Request, res: Response): Promise<Response> => { return res.status(200).send(user); } catch (error) { const e = error as Error; + console.log(e.message); return res.status(400).json({ error: e.message }); } }; @@ -135,6 +136,7 @@ const login = async (req: Request, res: Response): Promise<Response> => { }); } catch (error) { const e = error as Error; + console.log(e.message); return res.status(400).json({ error: e.message }); } }; diff --git a/src/Services/UserService.ts b/src/Services/UserService.ts index 4cd7a934e723eb974fce5a0b676806c2e7b93cfa..5dc145477e6a0f07cc9f02adbf097e81966aa9d1 100644 --- a/src/Services/UserService.ts +++ b/src/Services/UserService.ts @@ -404,20 +404,19 @@ const login = async (userDTO: UserLoginDTO): Promise<User> => User.findOne({ ], where: { email: userDTO.email, - status: status.approved, - active: true, }, }).then((user: User) => { if (!user) { throw new Error('user not found'); + } else if (user.get('status') === status.pending || user.get('active') === false) { + throw new Error('user not accepted'); } else if (user && bcrypt.compareSync(userDTO.password, String(user.get('password')))) { return user; } else { throw new Error('auth failed'); } }).catch((error: Error) => { - console.log(error); - throw new Error('find user error'); + throw error; }); const listUsersById = async (ids: number[]): Promise<User[]> => {