Cleanup

Author: davellanedam

app/controllers/auth/helpers/blockUser.js

@@ -12,10 +12,10 @@ const blockUser = (user) => {
     user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK)
     user.save((err, result) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       if (result) {
-        resolve(buildErrObject(409, 'BLOCKED_USER'))
+        return resolve(buildErrObject(409, 'BLOCKED_USER'))
       }
     })
   })

app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js

@@ -12,16 +12,15 @@ const checkLoginAttemptsAndBlockExpires = (user) => {
       user.loginAttempts = 0
       user.save((err, result) => {
         if (err) {
-          reject(buildErrObject(422, err.message))
+          return reject(buildErrObject(422, err.message))
         }
         if (result) {
-          resolve(true)
+          return resolve(true)
         }
       })
-    } else {
-      // User is not blocked, check password (normal behaviour)
-      resolve(true)
     }
+    // User is not blocked, check password (normal behaviour)
+    resolve(true)
   })
 }
 

app/controllers/auth/helpers/passwordsDoNotMatch.js

@@ -12,7 +12,7 @@ const passwordsDoNotMatch = async (user) => {
   await saveLoginAttemptsToDB(user)
   return new Promise((resolve, reject) => {
     if (user.loginAttempts <= LOGIN_ATTEMPTS) {
-      resolve(buildErrObject(409, 'WRONG_PASSWORD'))
+      return resolve(buildErrObject(409, 'WRONG_PASSWORD'))
     } else {
       resolve(blockUser(user))
     }

app/controllers/auth/helpers/returnRegisterToken.js

@@ -6,14 +6,16 @@ const { generateToken } = require('./generateToken')
  * @param {Object} userInfo - user object
  */
 const returnRegisterToken = (item, userInfo) => {
-  if (process.env.NODE_ENV !== 'production') {
-    userInfo.verification = item.verification
-  }
-  const data = {
-    token: generateToken(item._id),
-    user: userInfo
-  }
-  return data
+  return new Promise((resolve) => {
+    if (process.env.NODE_ENV !== 'production') {
+      userInfo.verification = item.verification
+    }
+    const data = {
+      token: generateToken(item._id),
+      user: userInfo
+    }
+    resolve(data)
+  })
 }
 
 module.exports = { returnRegisterToken }

app/controllers/auth/helpers/saveForgotPassword.js

@@ -22,7 +22,7 @@ const saveForgotPassword = (req) => {
     })
     forgot.save((err, item) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       resolve(item)
     })

app/controllers/auth/helpers/saveLoginAttemptsToDB.js

@@ -8,7 +8,7 @@ const saveLoginAttemptsToDB = (user) => {
   return new Promise((resolve, reject) => {
     user.save((err, result) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       if (result) {
         resolve(true)

app/controllers/auth/helpers/saveUserAccessAndReturnToken.js

@@ -23,7 +23,7 @@ const saveUserAccessAndReturnToken = (req, user) => {
     })
     userAccess.save((err) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       const userInfo = setUserInfo(user)
       // Returns data with access token

app/controllers/auth/helpers/setUserInfo.js

@@ -3,21 +3,23 @@
  * @param {Object} req - request object
  */
 const setUserInfo = (req) => {
-  let user = {
-    _id: req._id,
-    name: req.name,
-    email: req.email,
-    role: req.role,
-    verified: req.verified
-  }
-  // Adds verification for testing purposes
-  if (process.env.NODE_ENV !== 'production') {
-    user = {
-      ...user,
-      verification: req.verification
+  return new Promise((resolve) => {
+    let user = {
+      _id: req._id,
+      name: req.name,
+      email: req.email,
+      role: req.role,
+      verified: req.verified
     }
-  }
-  return user
+    // Adds verification for testing purposes
+    if (process.env.NODE_ENV !== 'production') {
+      user = {
+        ...user,
+        verification: req.verification
+      }
+    }
+    resolve(user)
+  })
 }
 
 module.exports = { setUserInfo }

app/controllers/auth/helpers/userIsBlocked.js

@@ -7,7 +7,7 @@ const { buildErrObject } = require('../../../middleware/utils')
 const userIsBlocked = (user) => {
   return new Promise((resolve, reject) => {
     if (user.blockExpires > new Date()) {
-      reject(buildErrObject(409, 'BLOCKED_USER'))
+      return reject(buildErrObject(409, 'BLOCKED_USER'))
     }
     resolve(true)
   })

app/controllers/auth/helpers/verifyUser.js

@@ -9,7 +9,7 @@ const verifyUser = (user) => {
     user.verified = true
     user.save((err, item) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       resolve({
         email: item.email,