Adding auth, media, and messaging.

diff --git a/src/controllers/auth.controller.js b/src/controllers/auth.controller.js
index 51e07e7c417ff9722fc232bcdc0ca1d8a2f7d612..73cef60e0a34be89dd7c7d363a9950f9c6e7ffec 100644 (file)
--- a/src/controllers/auth.controller.js
+++ b/src/controllers/auth.controller.js
@@ -85,7 +85,10 @@ module.exports = {
       if (auth.is_locked) {
         return res.status(401).send({ message: 'Your account is locked due to suspicious activity. Please contact us to continue.' });
       }
-      const isValid = await user.comparePassword(password);
+      logger.warn(user);
+      logger.warn(auth.password);
+      logger.warn(password);
+      const isValid = await user.comparePassword(password, auth);
       if (!isValid) {
         await user.failLogin();
         return res.status(401).send({ success: false, user: null, token: null });

diff --git a/src/models/user.model.js b/src/models/user.model.js
index afd3fb5936c66e074d4e9963e44e5fb639a53b25..0d19c8d74986b484387534fd68536b020e2fec19 100644 (file)
--- a/src/models/user.model.js
+++ b/src/models/user.model.js
@@ -145,8 +145,7 @@ class User extends Model {
     });
   }
 
-  async comparePassword(password) {
-    const auth = await db.authentication.find_by_user_id(this.id);
+  async comparePassword(password, auth) {
     console.log(auth);
     console.log(password);
     console.log(auth.password);