mifi/pfosi-looking-api
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Mike Fitzpatrick
2018-03-03 13:07:07 -05:00
parent ab2ada933d
commit d2164121ea
10 changed files with 647 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
models/user.js
View File

@@ -68,13 +68,15 @@ UserSchema.post('save', function (err, res, next) {
const UserModel = Mongoose.model('users', UserSchema);
var logger = require('../modules/logger');
function hashPassword (password, callback) {
callback = callback || false;
Authentication.hashPassword(password, (err, password) => {
if (err !== null) {
err = new Error({ success: false, message: 'There was an error hashing the updated password.', err: err });
console.error('[updateUser:hashPassword] ', err);
logger.error('[updateUser:hashPassword] ', err);
if (callback) {
callback(err, null);
@@ -101,7 +103,7 @@ function confirmPassword (username, passwordToValidate, callback) {
UserModel.findById({ userName: username }, (err, user) => {
if (err !== null) {
err = new Error({ success: false, message: 'There was an error locating the user.', err: (err || null) });
console.error('[updateUser:confirmPassword] ', err);
logger.error('[updateUser:confirmPassword] ', err);
if (callback) {
callback(err, null);
@@ -114,7 +116,7 @@ function confirmPassword (username, passwordToValidate, callback) {
Authentication.verifyPassword(passwordToValidate, Buffer.from(storedUser.password, 'hex'), (err, valid) => {
if (err !== null || !valid) {
err = new Error({ success: false, message: (!err && !valid ? 'The current password was incorrect.' : 'There was an error attempting to validate the password.'), err: (err || null) });
console.error('[updateUser:confirmPassword] ', { err: err, valid: valid });
logger.error('[updateUser:confirmPassword] ', { err: err, valid: valid });
if (callback) {
callback(err, null);
@@ -183,7 +185,7 @@ module.exports = {
string: 'There was an error authenticating the user.'
}
}
console.log('[UserModel::authenticateUser] Error finding user', { err: err, username: login.userName });
logger.debug('[UserModel::authenticateUser] Error finding user', { err: err, username: login.userName });
resolve(loginObject);
}
@@ -207,7 +209,7 @@ module.exports = {
try {
Authentication.verifyPassword(login.password, Buffer.from(user.password, 'hex'), (err, valid) => {
if (err) {
console.log('[UserModel::authenticateUser] Error validating password', { err: err, user: user });
logger.debug('[UserModel::authenticateUser] Error validating password', { err: err, user: user });
reject(err);
}
@@ -231,7 +233,7 @@ module.exports = {
loginObject.timestamp = Date.now();
console.log('[UserModel::authenticateUser] User Validated', { user: user, loginObject: loginObject });
logger.debug('[UserModel::authenticateUser] User Validated', { user: user, loginObject: loginObject });
resolve(loginObject);
} else {
loginObject.err = {
@@ -240,7 +242,7 @@ module.exports = {
string: 'The user id or password you entered was invalid.'
};
console.log('[UserModel::authenticateUser] Invalid Password', { user: user, loginObject: loginObject });
logger.debug('[UserModel::authenticateUser] Invalid Password', { user: user, loginObject: loginObject });
resolve(loginObject);
}
});
@@ -256,7 +258,7 @@ module.exports = {
}
};
console.log('[UserModel::authenticateUser] Error verifying password', { err: err, user: user });
logger.error('[UserModel::authenticateUser] Error verifying password', { err: err, user: user });
resolve(loginObject);
}
}
@@ -271,7 +273,7 @@ module.exports = {
string: 'The user is not authorized, please contact an administrator.'
}
};
console.log('[UserModel::authenticateUser] The user is disabled', { err: err, user: user });
logger.debug('[UserModel::authenticateUser] The user is disabled', { err: err, user: user });
resolve(loginObject);
}
else {
@@ -284,7 +286,7 @@ module.exports = {
string: 'The user id or password you entered was invalid.'
}
};
console.log('[UserModel::authenticateUser] The user does not exist', { err: err, user: user });
logger.debug('[UserModel::authenticateUser] The user does not exist', { err: err, user: user });
resolve(loginObject);
}
}
@@ -304,7 +306,7 @@ module.exports = {
var userInstance = new UserModel(user);
userInstance.save((err, result) => {
console.log('createUser', { err: err, result: result, user: userInstance });
logger.debug('createUser', { err: err, result: result, user: userInstance });
if (err) {
reject(err);