Merge pull request #196 from davellanedam/development

Development

Author: davellanedam

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v8.1.0 (March 30, 2020)
+
+-   NPM updated
+-   Prettier updated to 2.x
+
 ## v8.0.1 (March 16, 2020)
 
 -   NPM updated

app/controllers/auth.js

@@ -19,7 +19,7 @@ const LOGIN_ATTEMPTS = 5
  * Generates a token
  * @param {Object} user - user object
  */
-const generateToken = user => {
+const generateToken = (user) => {
   // Gets expiration time
   const expiration =
     Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES
@@ -42,7 +42,7 @@ const generateToken = user => {
  * Creates an object with user info
  * @param {Object} req - request object
  */
-const setUserInfo = req => {
+const setUserInfo = (req) => {
   let user = {
     _id: req._id,
     name: req.name,
@@ -73,7 +73,7 @@ const saveUserAccessAndReturnToken = async (req, user) => {
       browser: utils.getBrowserInfo(req),
       country: utils.getCountry(req)
     })
-    userAccess.save(err => {
+    userAccess.save((err) => {
       if (err) {
         reject(utils.buildErrObject(422, err.message))
       }
@@ -91,7 +91,7 @@ const saveUserAccessAndReturnToken = async (req, user) => {
  * Blocks a user by setting blockExpires to the specified date based on constant HOURS_TO_BLOCK
  * @param {Object} user - user object
  */
-const blockUser = async user => {
+const blockUser = async (user) => {
   return new Promise((resolve, reject) => {
     user.blockExpires = addHours(new Date(), HOURS_TO_BLOCK)
     user.save((err, result) => {
@@ -109,7 +109,7 @@ const blockUser = async user => {
  * Saves login attempts to dabatabse
  * @param {Object} user - user object
  */
-const saveLoginAttemptsToDB = async user => {
+const saveLoginAttemptsToDB = async (user) => {
   return new Promise((resolve, reject) => {
     user.save((err, result) => {
       if (err) {
@@ -126,14 +126,14 @@ const saveLoginAttemptsToDB = async user => {
  * Checks that login attempts are greater than specified in constant and also that blockexpires is less than now
  * @param {Object} user - user object
  */
-const blockIsExpired = user =>
+const blockIsExpired = (user) =>
   user.loginAttempts > LOGIN_ATTEMPTS && user.blockExpires <= new Date()
 
 /**
  *
  * @param {Object} user - user object.
  */
-const checkLoginAttemptsAndBlockExpires = async user => {
+const checkLoginAttemptsAndBlockExpires = async (user) => {
   return new Promise((resolve, reject) => {
     // Let user try to login again after blockexpires, resets user loginAttempts
     if (blockIsExpired(user)) {
@@ -157,7 +157,7 @@ const checkLoginAttemptsAndBlockExpires = async user => {
  * Checks if blockExpires from user is greater than now
  * @param {Object} user - user object
  */
-const userIsBlocked = async user => {
+const userIsBlocked = async (user) => {
   return new Promise((resolve, reject) => {
     if (user.blockExpires > new Date()) {
       reject(utils.buildErrObject(409, 'BLOCKED_USER'))
@@ -170,7 +170,7 @@ const userIsBlocked = async user => {
  * Finds user by email
  * @param {string} email - user´s email
  */
-const findUser = async email => {
+const findUser = async (email) => {
   return new Promise((resolve, reject) => {
     User.findOne(
       {
@@ -189,7 +189,7 @@ const findUser = async email => {
  * Finds user by ID
  * @param {string} id - user´s id
  */
-const findUserById = async userId => {
+const findUserById = async (userId) => {
   return new Promise((resolve, reject) => {
     User.findById(userId, (err, item) => {
       utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST')
@@ -202,7 +202,7 @@ const findUserById = async userId => {
  * Adds one attempt to loginAttempts, then compares loginAttempts with the constant LOGIN_ATTEMPTS, if is less returns wrong password, else returns blockUser function
  * @param {Object} user - user object
  */
-const passwordsDoNotMatch = async user => {
+const passwordsDoNotMatch = async (user) => {
   user.loginAttempts += 1
   await saveLoginAttemptsToDB(user)
   return new Promise((resolve, reject) => {
@@ -219,7 +219,7 @@ const passwordsDoNotMatch = async user => {
  * Registers a new user in database
  * @param {Object} req - request object
  */
-const registerUser = async req => {
+const registerUser = async (req) => {
   return new Promise((resolve, reject) => {
     const user = new User({
       name: req.name,
@@ -256,7 +256,7 @@ const returnRegisterToken = (item, userInfo) => {
  * Checks if verification id exists for user
  * @param {string} id - verification id
  */
-const verificationExists = async id => {
+const verificationExists = async (id) => {
   return new Promise((resolve, reject) => {
     User.findOne(
       {
@@ -275,7 +275,7 @@ const verificationExists = async id => {
  * Verifies an user
  * @param {Object} user - user object
  */
-const verifyUser = async user => {
+const verifyUser = async (user) => {
   return new Promise((resolve, reject) => {
     user.verified = true
     user.save((err, item) => {
@@ -327,7 +327,7 @@ const updatePassword = async (password, user) => {
  * Finds user by email to reset password
  * @param {string} email - user email
  */
-const findUserToResetPassword = async email => {
+const findUserToResetPassword = async (email) => {
   return new Promise((resolve, reject) => {
     User.findOne(
       {
@@ -345,7 +345,7 @@ const findUserToResetPassword = async email => {
  * Checks if a forgot password verification exists
  * @param {string} id - verification id
  */
-const findForgotPassword = async id => {
+const findForgotPassword = async (id) => {
   return new Promise((resolve, reject) => {
     ForgotPassword.findOne(
       {
@@ -364,7 +364,7 @@ const findForgotPassword = async id => {
  * Creates a new password forgot
  * @param {Object} req - request object
  */
-const saveForgotPassword = async req => {
+const saveForgotPassword = async (req) => {
   return new Promise((resolve, reject) => {
     const forgot = new ForgotPassword({
       email: req.body.email,
@@ -386,7 +386,7 @@ const saveForgotPassword = async req => {
  * Builds an object with created forgot password object, if env is development or testing exposes the verification
  * @param {Object} item - created forgot password object
  */
-const forgotPasswordResponse = item => {
+const forgotPasswordResponse = (item) => {
   let data = {
     msg: 'RESET_EMAIL_SENT',
     email: item.email
@@ -421,7 +421,7 @@ const checkPermissions = async (data, next) => {
  * Gets user id from token
  * @param {string} token - Encrypted and encoded token
  */
-const getUserIdFromToken = async token => {
+const getUserIdFromToken = async (token) => {
   return new Promise((resolve, reject) => {
     // Decrypts, verifies and decode token
     jwt.verify(auth.decrypt(token), process.env.JWT_SECRET, (err, decoded) => {
@@ -563,7 +563,7 @@ exports.getRefreshToken = async (req, res) => {
  * Roles authorization function called by route
  * @param {Array} roles - roles specified on the route
  */
-exports.roleAuthorization = roles => async (req, res, next) => {
+exports.roleAuthorization = (roles) => async (req, res, next) => {
   try {
     const data = {
       id: req.user._id,

app/controllers/cities.js

@@ -33,7 +33,7 @@ const cityExistsExcludingItself = async (id, name) => {
  * Checks if a city already exists in database
  * @param {string} name - name of item
  */
-const cityExists = async name => {
+const cityExists = async (name) => {
   return new Promise((resolve, reject) => {
     model.findOne(
       {

app/controllers/profile.js

@@ -11,7 +11,7 @@ const auth = require('../middleware/auth')
  * Gets profile from database by id
  * @param {string} id - user id
  */
-const getProfileFromDB = async id => {
+const getProfileFromDB = async (id) => {
   return new Promise((resolve, reject) => {
     model.findById(id, '-_id -updatedAt -createdAt', (err, user) => {
       utils.itemNotFound(err, user, reject, 'NOT_FOUND')
@@ -47,7 +47,7 @@ const updateProfileInDB = async (req, id) => {
  * Finds user by id
  * @param {string} email - user id
  */
-const findUser = async id => {
+const findUser = async (id) => {
   return new Promise((resolve, reject) => {
     model.findById(id, 'password email', (err, user) => {
       utils.itemNotFound(err, user, reject, 'USER_DOES_NOT_EXIST')
@@ -61,7 +61,7 @@ const findUser = async id => {
  * @param {Object} user - user object
  */
 const passwordsDoNotMatch = async () => {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     resolve(utils.buildErrObject(409, 'WRONG_PASSWORD'))
   })
 }
@@ -80,7 +80,7 @@ const changePasswordInDB = async (id, req) => {
       user.password = req.newPassword
 
       // Saves in DB
-      user.save(error => {
+      user.save((error) => {
         if (err) {
           reject(utils.buildErrObject(422, error.message))
         }

app/controllers/profile.validate.js

@@ -35,11 +35,11 @@ exports.updateProfile = [
     .trim(),
   check('urlTwitter')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   check('urlGitHub')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   (req, res, next) => {
     validationResult(req, res, next)

app/controllers/users.js

@@ -13,7 +13,7 @@ const emailer = require('../middleware/emailer')
  * Creates a new item in database
  * @param {Object} req - request object
  */
-const createItem = async req => {
+const createItem = async (req) => {
   return new Promise((resolve, reject) => {
     const user = new model({
       name: req.name,

app/controllers/users.validate.js

@@ -61,11 +61,11 @@ exports.createItem = [
     .trim(),
   check('urlTwitter')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   check('urlGitHub')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   (req, res, next) => {
     validationResult(req, res, next)
@@ -117,11 +117,11 @@ exports.updateItem = [
     .trim(),
   check('urlTwitter')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   check('urlGitHub')
     .optional()
-    .custom(v => (v === '' ? true : validator.isURL(v)))
+    .custom((v) => (v === '' ? true : validator.isURL(v)))
     .withMessage('NOT_A_VALID_URL'),
   check('id')
     .exists()

app/middleware/db.js

@@ -19,17 +19,17 @@ const buildSort = (sort, order) => {
  * Hack for mongoose-paginate, removes 'id' from results
  * @param {Object} result - result object
  */
-const cleanPaginationID = result => {
-  result.docs.map(element => delete element.id)
+const cleanPaginationID = (result) => {
+  result.docs.map((element) => delete element.id)
   return result
 }
 
 /**
  * Builds initial options for query
  * @param {Object} query - query object
  */
-const listInitOptions = async req => {
-  return new Promise(resolve => {
+const listInitOptions = async (req) => {
+  return new Promise((resolve) => {
     const order = req.query.order || -1
     const sort = req.query.sort || 'createdAt'
     const sortBy = buildSort(sort, order)
@@ -66,7 +66,7 @@ module.exports = {
           // Takes fields param and builds an array by splitting with ','
           const arrayFields = query.fields.split(',')
           // Adds SQL Like %word% with regex
-          arrayFields.map(item => {
+          arrayFields.map((item) => {
             array.push({
               [item]: {
                 $regex: new RegExp(query.filter, 'i')

app/middleware/emailer.js

@@ -24,7 +24,7 @@ const sendEmail = async (data, callback) => {
     subject: data.subject,
     html: data.htmlMessage
   }
-  transporter.sendMail(mailOptions, err => {
+  transporter.sendMail(mailOptions, (err) => {
     if (err) {
       return callback(false)
     }
@@ -50,7 +50,7 @@ const prepareToSendEmail = (user, subject, htmlMessage) => {
     htmlMessage
   }
   if (process.env.NODE_ENV === 'production') {
-    sendEmail(data, messageSent =>
+    sendEmail(data, (messageSent) =>
       messageSent
         ? console.log(`Email SENT to: ${user.email}`)
         : console.log(`Email FAILED to: ${user.email}`)

app/middleware/utils.js

@@ -6,31 +6,27 @@ const { validationResult } = require('express-validator')
  * Removes extension from file
  * @param {string} file - filename
  */
-exports.removeExtensionFromFile = file => {
-  return file
-    .split('.')
-    .slice(0, -1)
-    .join('.')
-    .toString()
+exports.removeExtensionFromFile = (file) => {
+  return file.split('.').slice(0, -1).join('.').toString()
 }
 
 /**
  * Gets IP from user
  * @param {*} req - request object
  */
-exports.getIP = req => requestIp.getClientIp(req)
+exports.getIP = (req) => requestIp.getClientIp(req)
 
 /**
  * Gets browser info from user
  * @param {*} req - request object
  */
-exports.getBrowserInfo = req => req.headers['user-agent']
+exports.getBrowserInfo = (req) => req.headers['user-agent']
 
 /**
  * Gets country from user using CloudFlare header 'cf-ipcountry'
  * @param {*} req - request object
  */
-exports.getCountry = req =>
+exports.getCountry = (req) =>
   req.headers['cf-ipcountry'] ? req.headers['cf-ipcountry'] : 'XX'
 
 /**
@@ -85,7 +81,7 @@ exports.validationResult = (req, res, next) => {
  * Builds success object
  * @param {string} message - success text
  */
-exports.buildSuccObject = message => {
+exports.buildSuccObject = (message) => {
   return {
     msg: message
   }
@@ -95,7 +91,7 @@ exports.buildSuccObject = message => {
  * Checks if given ID is good for MongoDB
  * @param {string} id - id to check
  */
-exports.isIDGood = async id => {
+exports.isIDGood = async (id) => {
   return new Promise((resolve, reject) => {
     const goodID = mongoose.Types.ObjectId.isValid(id)
     return goodID