Changing utils and emailer refs

Author: davellanedam

app/controllers/auth/forgotPassword.js

@@ -4,8 +4,8 @@ const {
   forgotPasswordResponse,
   saveForgotPassword
 } = require('./helpers')
-const utils = require('../../middleware/utils')
-const emailer = require('../../middleware/emailer')
+const { handleError } = require('../../middleware/utils')
+const { sendResetPasswordEmailMessage } = require('../../middleware/emailer')
 
 /**
  * Forgot password function called by route
@@ -19,10 +19,10 @@ const forgotPassword = async (req, res) => {
     const data = matchedData(req)
     await findUser(data.email)
     const item = await saveForgotPassword(req)
-    emailer.sendResetPasswordEmailMessage(locale, item)
+    sendResetPasswordEmailMessage(locale, item)
     res.status(200).json(forgotPasswordResponse(item))
   } catch (error) {
-    utils.handleError(res, error)
+    handleError(res, error)
   }
 }
 

app/controllers/auth/getRefreshToken.js

@@ -3,7 +3,7 @@ const {
   findUserById,
   saveUserAccessAndReturnToken
 } = require('./helpers')
-const utils = require('../../middleware/utils')
+const { isIDGood, handleError } = require('../../middleware/utils')
 
 /**
  * Refresh token function called by route
@@ -16,14 +16,14 @@ const getRefreshToken = async (req, res) => {
       .replace('Bearer ', '')
       .trim()
     let userId = await getUserIdFromToken(tokenEncrypted)
-    userId = await utils.isIDGood(userId)
+    userId = await isIDGood(userId)
     const user = await findUserById(userId)
     const token = await saveUserAccessAndReturnToken(req, user)
     // Removes user info from response
     delete token.user
     res.status(200).json(token)
   } catch (error) {
-    utils.handleError(res, error)
+    handleError(res, error)
   }
 }
 

app/controllers/auth/helpers/blockUser.js

@@ -1,7 +1,7 @@
 const { addHours } = require('date-fns')
 const HOURS_TO_BLOCK = 2
 
-const utils = require('../../../middleware/utils')
+const { buildErrObject } = require('../../../middleware/utils')
 
 /**
  * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK
@@ -12,10 +12,10 @@ const blockUser = (user) => {
     user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK)
     user.save((err, result) => {
       if (err) {
-        reject(utils.buildErrObject(422, err.message))
+        reject(buildErrObject(422, err.message))
       }
       if (result) {
-        resolve(utils.buildErrObject(409, 'BLOCKED_USER'))
+        resolve(buildErrObject(409, 'BLOCKED_USER'))
       }
     })
   })

app/controllers/auth/helpers/checkLoginAttemptsAndBlockExpires.js

@@ -1,5 +1,5 @@
 const { blockIsExpired } = require('./blockIsExpired')
-const utils = require('../../../middleware/utils')
+const { buildErrObject } = require('../../../middleware/utils')
 
 /**
  *
@@ -12,7 +12,7 @@ const checkLoginAttemptsAndBlockExpires = (user) => {
       user.loginAttempts = 0
       user.save((err, result) => {
         if (err) {
-          reject(utils.buildErrObject(422, err.message))
+          reject(buildErrObject(422, err.message))
         }
         if (result) {
           resolve(true)

app/controllers/auth/helpers/checkPermissions.js

@@ -1,5 +1,5 @@
 const User = require('../../../models/user')
-const utils = require('../../../middleware/utils')
+const { itemNotFound, buildErrObject } = require('../../../middleware/utils')
 
 /**
  * Checks against user if has quested role
@@ -9,11 +9,11 @@ const utils = require('../../../middleware/utils')
 const checkPermissions = (data, next) => {
   return new Promise((resolve, reject) => {
     User.findById(data.id, (err, result) => {
-      utils.itemNotFound(err, result, 'NOT_FOUND')
+      itemNotFound(err, result, 'NOT_FOUND')
       if (data.roles.indexOf(result.role) > -1) {
         return resolve(next())
       }
-      return reject(utils.buildErrObject(401, 'UNAUTHORIZED'))
+      return reject(buildErrObject(401, 'UNAUTHORIZED'))
     })
   })
 }

app/controllers/auth/helpers/findForgotPassword.js

@@ -1,5 +1,5 @@
 const ForgotPassword = require('../../../models/forgotPassword')
-const utils = require('../../../middleware/utils')
+const { itemNotFound } = require('../../../middleware/utils')
 
 /**
  * Checks if a forgot password verification exists
@@ -13,7 +13,7 @@ const findForgotPassword = (id) => {
         used: false
       },
       (err, item) => {
-        utils.itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
+        itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
         resolve(item)
       }
     )

app/controllers/auth/helpers/findUser.js

@@ -1,5 +1,5 @@
 const User = require('../../../models/user')
-const utils = require('../../../middleware/utils')
+const { itemNotFound } = require('../../../middleware/utils')
 
 /**
  * Finds user by email
@@ -13,7 +13,7 @@ const findUser = (email) => {
       },
       'password loginAttempts blockExpires name email role verified verification',
       (err, item) => {
-        utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
+        itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
         resolve(item)
       }
     )

app/controllers/auth/helpers/findUserById.js

@@ -1,5 +1,5 @@
 const User = require('../../../models/user')
-const utils = require('../../../middleware/utils')
+const { itemNotFound } = require('../../../middleware/utils')
 
 /**
  * Finds user by ID
@@ -8,7 +8,7 @@ const utils = require('../../../middleware/utils')
 const findUserById = (userId) => {
   return new Promise((resolve) => {
     User.findById(userId, (err, item) => {
-      utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
+      itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
       resolve(item)
     })
   })

app/controllers/auth/helpers/findUserToResetPassword.js

@@ -1,5 +1,5 @@
 const User = require('../../../models/user')
-const utils = require('../../../middleware/utils')
+const { itemNotFound } = require('../../../middleware/utils')
 
 /**
  * Finds user by email to reset password
@@ -12,7 +12,7 @@ const findUserToResetPassword = (email) => {
         email
       },
       (err, user) => {
-        utils.itemNotFound(err, user, 'NOT_FOUND')
+        itemNotFound(err, user, 'NOT_FOUND')
         resolve(user)
       }
     )

app/controllers/auth/helpers/generateToken.js

@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken')
-const auth = require('../../../middleware/auth')
+const { encrypt } = require('../../../middleware/auth')
 
 /**
  * Generates a token
@@ -11,7 +11,7 @@ const generateToken = (user) => {
     Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES
 
   // returns signed and encrypted token
-  return auth.encrypt(
+  return encrypt(
     jwt.sign(
       {
         data: {