Missing try/catches

Author: davellanedam

app/controllers/auth/helpers/checkPermissions.js

@@ -8,12 +8,16 @@ const { itemNotFound, buildErrObject } = require('../../../middleware/utils')
  */
 const checkPermissions = ({ id = '', roles = [] }, next) => {
   return new Promise((resolve, reject) => {
-    User.findById(id, (err, result) => {
-      itemNotFound(err, result, 'NOT_FOUND')
-      if (roles.indexOf(result.role) > -1) {
-        return resolve(next())
+    User.findById(id, async (err, result) => {
+      try {
+        await itemNotFound(err, result, 'USER_NOT_FOUND')
+        if (roles.indexOf(result.role) > -1) {
+          return resolve(next())
+        }
+        reject(buildErrObject(401, 'UNAUTHORIZED'))
+      } catch (error) {
+        reject(error)
       }
-      return reject(buildErrObject(401, 'UNAUTHORIZED'))
     })
   })
 }

app/controllers/auth/helpers/findForgotPassword.js

@@ -1,5 +1,6 @@
 const ForgotPassword = require('../../../models/forgotPassword')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Checks if a forgot password verification exists
@@ -12,9 +13,13 @@ const findForgotPassword = (id = '') => {
         verification: id,
         used: false
       },
-      (err, item) => {
-        itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
-        resolve(item)
+      async (err, item) => {
+        try {
+          await itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
+          resolve(item)
+        } catch (error) {
+          reject(error)
+        }
       }
     )
   })

app/controllers/auth/helpers/findUser.js

@@ -1,5 +1,6 @@
 const User = require('../../../models/user')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Finds user by email
@@ -12,9 +13,13 @@ const findUser = (email = '') => {
         email
       },
       'password loginAttempts blockExpires name email role verified verification',
-      (err, item) => {
-        itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
-        resolve(item)
+      async (err, item) => {
+        try {
+          await itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
+          resolve(item)
+        } catch (error) {
+          reject(error)
+        }
       }
     )
   })

app/controllers/auth/helpers/findUserById.js

@@ -1,15 +1,20 @@
 const User = require('../../../models/user')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Finds user by ID
  * @param {string} id - user´s id
  */
 const findUserById = (userId = '') => {
   return new Promise((resolve) => {
-    User.findById(userId, (err, item) => {
-      itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
-      resolve(item)
+    User.findById(userId, async (err, item) => {
+      try {
+        await itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
+        resolve(item)
+      } catch (error) {
+        reject(error)
+      }
     })
   })
 }

app/controllers/auth/helpers/findUserToResetPassword.js

@@ -1,5 +1,6 @@
 const User = require('../../../models/user')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Finds user by email to reset password
@@ -11,9 +12,13 @@ const findUserToResetPassword = (email = '') => {
       {
         email
       },
-      (err, user) => {
-        itemNotFound(err, user, 'NOT_FOUND')
-        resolve(user)
+      async (err, user) => {
+        try {
+          await itemNotFound(err, user, 'NOT_FOUND')
+          resolve(user)
+        } catch (error) {
+          reject(error)
+        }
       }
     )
   })

app/controllers/auth/helpers/markResetPasswordAsUsed.js

@@ -1,3 +1,4 @@
+const { reject } = require('bcrypt/promises')
 const {
   getIP,
   getBrowserInfo,
@@ -17,9 +18,13 @@ const markResetPasswordAsUsed = (req = {}, forgot = {}) => {
     forgot.ipChanged = getIP(req)
     forgot.browserChanged = getBrowserInfo(req)
     forgot.countryChanged = getCountry(req)
-    forgot.save((err, item) => {
-      itemNotFound(err, item, 'NOT_FOUND')
-      resolve(buildSuccObject('PASSWORD_CHANGED'))
+    forgot.save(async (err, item) => {
+      try {
+        await itemNotFound(err, item, 'NOT_FOUND')
+        resolve(buildSuccObject('PASSWORD_CHANGED'))
+      } catch (error) {
+        reject(error)
+      }
     })
   })
 }

app/controllers/auth/helpers/updatePassword.js

@@ -1,3 +1,4 @@
+const { reject } = require('bcrypt/promises')
 const { itemNotFound } = require('../../../middleware/utils')
 
 /**
@@ -8,9 +9,13 @@ const { itemNotFound } = require('../../../middleware/utils')
 const updatePassword = (password = '', user = {}) => {
   return new Promise((resolve) => {
     user.password = password
-    user.save((err, item) => {
-      itemNotFound(err, item, 'NOT_FOUND')
-      resolve(item)
+    user.save(async (err, item) => {
+      try {
+        await itemNotFound(err, item, 'NOT_FOUND')
+        resolve(item)
+      } catch (error) {
+        reject(error)
+      }
     })
   })
 }

app/controllers/auth/helpers/verificationExists.js

@@ -1,5 +1,6 @@
 const User = require('../../../models/user')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Checks if verification id exists for user
@@ -12,9 +13,13 @@ const verificationExists = (id = '') => {
         verification: id,
         verified: false
       },
-      (err, user) => {
-        itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED')
-        resolve(user)
+      async (err, user) => {
+        try {
+          await itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED')
+          resolve(user)
+        } catch (error) {
+          reject(error)
+        }
       }
     )
   })

app/controllers/profile/helpers/changePasswordInDB.js

@@ -12,19 +12,23 @@ const {
  */
 const changePasswordInDB = (id = '', req = {}) => {
   return new Promise((resolve, reject) => {
-    User.findById(id, '+password', (err, user) => {
-      itemNotFound(err, user, 'NOT_FOUND')
+    User.findById(id, '+password', async (err, user) => {
+      try {
+        await itemNotFound(err, user, 'NOT_FOUND')
 
-      // Assigns new password to user
-      user.password = req.newPassword
+        // Assigns new password to user
+        user.password = req.newPassword
 
-      // Saves in DB
-      user.save((error) => {
-        if (err) {
-          return reject(buildErrObject(422, error.message))
-        }
-        resolve(buildSuccObject('PASSWORD_CHANGED'))
-      })
+        // Saves in DB
+        user.save((error) => {
+          if (err) {
+            return reject(buildErrObject(422, error.message))
+          }
+          resolve(buildSuccObject('PASSWORD_CHANGED'))
+        })
+      } catch (error) {
+        reject(error)
+      }
     })
   })
 }

app/controllers/profile/helpers/findUser.js

@@ -1,15 +1,20 @@
 const User = require('../../../models/user')
 const { itemNotFound } = require('../../../middleware/utils')
+const { reject } = require('bcrypt/promises')
 
 /**
  * Finds user by id
  * @param {string} id - user id
  */
 const findUser = (id = '') => {
   return new Promise((resolve) => {
-    User.findById(id, 'password email', (err, user) => {
-      itemNotFound(err, user, 'USER_DOES_NOT_EXIST')
-      resolve(user)
+    User.findById(id, 'password email', async (err, user) => {
+      try {
+        await itemNotFound(err, user, 'USER_DOES_NOT_EXIST')
+        resolve(user)
+      } catch (error) {
+        reject(error)
+      }
     })
   })
 }