edit Suggested changes #15

GSG-G10 · Oct 30, 2021 · ad622a3 · ad622a3
1 parent 7116e47
commit ad622a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/controllers/users/login.js b/server/controllers/users/login.js
@@ -12,13 +12,14 @@ const login = async (req, res, next) => {
     const { rows } = await checkEmailQuery(email);
 
     if (!rows.length) {
-      throw new Error({ message: 'Invalid email or password' });
+      return res.status(400).json({ message: 'Invalid email or password' });
     }
+
     const compared = await bcrypt.compare(password, rows[0].password);
     if (!compared) {
-      throw new Error({ message: 'Invalid email or password' });
+      return res.status(400).json({ message: 'Invalid email or password' });
     }
-    const token = await signToken(email, rows[0].id, rows[0].name, rows[0].phone, rows[0].avater);
+    const token = await signToken(email, rows[0].id);
     return res.cookie('token', token).json({ message: 'You are Logged Successfully' });
   } catch (err) {
     if (err.details) {

diff --git a/server/database/connection.js b/server/database/connection.js
@@ -1,3 +1,4 @@
+require('env2')('.env');
 const { Pool } = require('pg');
 
 const {