fixing dependencies so that prettier linting works in Atom

This commit is contained in:
Chris Troutner
2019-10-13 12:26:27 -07:00
parent 46086a2761
commit c18604daf3
5 changed files with 553 additions and 1091 deletions
+533 -1063
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -55,11 +55,11 @@
"devDependencies": {
"chai": "^4.1.2",
"coveralls": "^3.0.2",
"eslint": "^6.0.0",
"eslint": "^5.16.0",
"eslint-config-promise": "^2.0.0",
"eslint-config-standard": "^14.0.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-node": "^9.0.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"mocha": "^6.0.0",
+9 -3
View File
@@ -19,13 +19,17 @@ User.pre('save', function preSave (next) {
new Promise((resolve, reject) => {
bcrypt.genSalt(10, (err, salt) => {
if (err) { return reject(err) }
if (err) {
return reject(err)
}
resolve(salt)
})
})
.then(salt => {
bcrypt.hash(user.password, salt, (err, hash) => {
if (err) { throw new Error(err) }
if (err) {
throw new Error(err)
}
user.password = hash
@@ -40,7 +44,9 @@ User.methods.validatePassword = function validatePassword (password) {
return new Promise((resolve, reject) => {
bcrypt.compare(password, user.password, (err, isMatch) => {
if (err) { return reject(err) }
if (err) {
return reject(err)
}
resolve(isMatch)
})
+3 -1
View File
@@ -138,7 +138,9 @@ async function getUser (ctx, next) {
ctx.throw(500)
}
if (next) { return next() }
if (next) {
return next()
}
}
/**
+5 -21
View File
@@ -8,42 +8,26 @@ module.exports.routes = [
{
method: 'POST',
route: '/',
handlers: [
user.createUser
]
handlers: [user.createUser]
},
{
method: 'GET',
route: '/',
handlers: [
validator.ensureUser,
user.getUsers
]
handlers: [validator.ensureUser, user.getUsers]
},
{
method: 'GET',
route: '/:id',
handlers: [
validator.ensureUser,
user.getUser
]
handlers: [validator.ensureUser, user.getUser]
},
{
method: 'PUT',
route: '/:id',
handlers: [
validator.ensureTargetUserOrAdmin,
user.getUser,
user.updateUser
]
handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.updateUser]
},
{
method: 'DELETE',
route: '/:id',
handlers: [
validator.ensureTargetUserOrAdmin,
user.getUser,
user.deleteUser
]
handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.deleteUser]
}
]