diff --git a/package.json b/package.json index d923ed1f1a30bd1b7753d665a08407233a5bb3e0..9173c5505a5e0eadbfe3db5da32281e586be927f 100644 --- a/package.json +++ b/package.json @@ -49,11 +49,11 @@ "browserify": "^13.1.0", "chai-xml": "^0.3.1", "docdash": "^0.4.0", - "eslint": "^3.3.1", + "eslint": "^3.7.1", "eslint-config-airbnb": "^13.0.0", "eslint-plugin-import": "^2.2.0", "eslint-plugin-jsx-a11y": "^2.2.3", - "eslint-plugin-react": "^6.1.1", + "eslint-plugin-react": "^6.4.0", "gulp": "^3.9.1", "gulp-babel": "^6.1.2", "gulp-cli": "^1.2.2", diff --git a/src/libs/models/user.js b/src/libs/models/user.js index 83315b8238e97ce11daf02a8234824ff660f3d7b..554fabf05b5816c0a13ecc825a682dcb141e803c 100644 --- a/src/libs/models/user.js +++ b/src/libs/models/user.js @@ -64,7 +64,7 @@ UserSchema.pre('save', function (next) { if (err) { return next(err); } - bcrypt.hash(user.password, salt, function (err, hash) { + bcrypt.hash(user.password, salt, null, function (err, hash) { if (err) { return next(err); }