Finished splitting middleware

Author: davellanedam

.eslintrc.json

@@ -1,26 +1,31 @@
 {
+  "parser": "babel-eslint",
+
   "env": {
     "node": true,
-    "mocha": true
-  },
-
-  "parserOptions": {
-    "ecmaVersion": 9
+    "mocha": true,
+    "es6": true
   },
 
   "globals": {
     "Promise": true,
     "_": true,
-    "async": true
+    "async": true,
+    "expect": true,
+    "jest": true
   },
 
   "rules": {
     "callback-return": [
-      "error", ["done", "proceed", "next", "onwards", "callback", "cb"]
+      "error",
+      ["done", "proceed", "next", "onwards", "callback", "cb"]
+    ],
+    "camelcase": [
+      "warn",
+      {
+        "properties": "always"
+      }
     ],
-    "camelcase": ["warn", {
-      "properties": "always"
-    }],
     "comma-style": ["warn", "last"],
     "curly": ["error"],
     "eqeqeq": ["error", "always"],
@@ -48,20 +53,26 @@
     "new-cap": ["off"],
     "consistent-this": ["error", "that"],
     "no-unused-vars": [
-      "warn",
+      "error",
       {
         "caughtErrors": "all",
         "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)"
       }
     ],
-    "no-use-before-define": ["error", {
-      "functions": false
-    }],
+    "no-use-before-define": [
+      "error",
+      {
+        "functions": false
+      }
+    ],
     "no-var": 2,
     "one-var": ["warn", "never"],
-    "prefer-arrow-callback": ["warn", {
-      "allowNamedFunctions": true
-    }],
+    "prefer-arrow-callback": [
+      "warn",
+      {
+        "allowNamedFunctions": true
+      }
+    ],
     "quotes": [
       "warn",
       "single",
@@ -70,17 +81,19 @@
         "allowTemplateLiterals": true
       }
     ],
-    "semi": ["error", "never"],
-    "semi-spacing": ["warn", {
-      "before": false,
-      "after": true
-    }],
+    "semi-spacing": [
+      "warn",
+      {
+        "before": false,
+        "after": true
+      }
+    ],
     "semi-style": ["warn", "last"],
     "space-before-function-paren": ["off", 2],
     "prettier/prettier": "error"
   },
   "extends": [
-    "formidable/rules/eslint/best-practices/on",
+    "formidable/rules/eslint/best-practices/off",
     "formidable/rules/eslint/es6/on",
     "formidable/rules/eslint/errors/off",
     "formidable/rules/eslint/strict/on",
@@ -89,7 +102,5 @@
     "formidable/rules/eslint/variables/on",
     "prettier"
   ],
-  "plugins": [
-    "prettier"
-  ]
+  "plugins": ["prettier"]
 }

app/controllers/auth/helpers/checkPermissions.js

@@ -9,7 +9,7 @@ const utils = require('../../../middleware/utils')
 const checkPermissions = (data, next) => {
   return new Promise((resolve, reject) => {
     User.findById(data.id, (err, result) => {
-      utils.itemNotFound(err, result, reject, 'NOT_FOUND')
+      utils.itemNotFound(err, result, 'NOT_FOUND')
       if (data.roles.indexOf(result.role) > -1) {
         return resolve(next())
       }

app/controllers/auth/helpers/findForgotPassword.js

@@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils')
  * @param {string} id - verification id
  */
 const findForgotPassword = (id) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     ForgotPassword.findOne(
       {
         verification: id,
         used: false
       },
       (err, item) => {
-        utils.itemNotFound(err, item, reject, 'NOT_FOUND_OR_ALREADY_USED')
+        utils.itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
         resolve(item)
       }
     )

app/controllers/auth/helpers/findUser.js

@@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils')
  * @param {string} email - user´s email
  */
 const findUser = (email) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     User.findOne(
       {
         email
       },
       'password loginAttempts blockExpires name email role verified verification',
       (err, item) => {
-        utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST')
+        utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
         resolve(item)
       }
     )

app/controllers/auth/helpers/findUserById.js

@@ -6,9 +6,9 @@ const utils = require('../../../middleware/utils')
  * @param {string} id - user´s id
  */
 const findUserById = (userId) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     User.findById(userId, (err, item) => {
-      utils.itemNotFound(err, item, reject, 'USER_DOES_NOT_EXIST')
+      utils.itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
       resolve(item)
     })
   })

app/controllers/auth/helpers/findUserToResetPassword.js

@@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils')
  * @param {string} email - user email
  */
 const findUserToResetPassword = (email) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     User.findOne(
       {
         email
       },
       (err, user) => {
-        utils.itemNotFound(err, user, reject, 'NOT_FOUND')
+        utils.itemNotFound(err, user, 'NOT_FOUND')
         resolve(user)
       }
     )

app/controllers/auth/helpers/markResetPasswordAsUsed.js

@@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils')
  * @param {Object} forgot - forgot object
  */
 const markResetPasswordAsUsed = (req, forgot) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     forgot.used = true
     forgot.ipChanged = utils.getIP(req)
     forgot.browserChanged = utils.getBrowserInfo(req)
     forgot.countryChanged = utils.getCountry(req)
     forgot.save((err, item) => {
-      utils.itemNotFound(err, item, reject, 'NOT_FOUND')
+      utils.itemNotFound(err, item, 'NOT_FOUND')
       resolve(utils.buildSuccObject('PASSWORD_CHANGED'))
     })
   })

app/controllers/auth/helpers/updatePassword.js

@@ -6,10 +6,10 @@ const utils = require('../../../middleware/utils')
  * @param {Object} user - user object
  */
 const updatePassword = (password, user) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     user.password = password
     user.save((err, item) => {
-      utils.itemNotFound(err, item, reject, 'NOT_FOUND')
+      utils.itemNotFound(err, item, 'NOT_FOUND')
       resolve(item)
     })
   })

app/controllers/auth/helpers/verificationExists.js

@@ -6,14 +6,14 @@ const utils = require('../../../middleware/utils')
  * @param {string} id - verification id
  */
 const verificationExists = (id) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     User.findOne(
       {
         verification: id,
         verified: false
       },
       (err, user) => {
-        utils.itemNotFound(err, user, reject, 'NOT_FOUND_OR_ALREADY_VERIFIED')
+        utils.itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED')
         resolve(user)
       }
     )

app/controllers/cities/helpers/cityExists.js

@@ -6,13 +6,13 @@ const utils = require('../../../middleware/utils')
  * @param {string} name - name of item
  */
 const cityExists = (name) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     City.findOne(
       {
         name
       },
       (err, item) => {
-        utils.itemAlreadyExists(err, item, reject, 'CITY_ALREADY_EXISTS')
+        utils.itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS')
         resolve(false)
       }
     )