ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switched mongoose methods to promises

master
Keith Irwin 2017-04-18 23:52:13 -04:00
parent 218435d8c7
commit 192d66ca6f
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
config/models.js
View File

@ -52,23 +52,23 @@ const userSchema = new mongoose.Schema({
userSchema.methods.createEmailToken = function(next){
var user = this;
crypto.randomBytes(16, (err,buf)=>{
if (err){ next(err,null); }
else {
user.emailToken = buf.toString('hex');
user.save();
return next(null,user.emailToken);
}
});
crypto.randomBytes(16)
.then( (buf)=>{
user.emailToken = buf.toString('hex');
user.save();
return next(null,user.emailToken);
})
.catch( (err)=>{ next(err,null); });
};
// Generate hash for new password
userSchema.methods.generateHash = function(password,next){
bcrypt.genSalt(8, (err,salt)=>{
if (err){ return next(err); }
bcrypt.genSalt(8)
.then( (salt)=>{
bcrypt.hash(password, salt, null, next);
});
})
.catch( (err)=>{ return next(err); });
};
// Create password reset token
@ -84,15 +84,14 @@ const userSchema = new mongoose.Schema({
// Create new token
else {
crypto.randomBytes(16, (err,buf)=>{
if (err){ next(err,null); }
else {
user.auth.passToken = buf.toString('hex');
user.auth.passTokenExpires = Date.now() + 3600000; // 1 hour
user.save();
return next(null,user.auth.passToken);
}
});
crypto.randomBytes(16)
.then( (buf)=>{
user.auth.passToken = buf.toString('hex');
user.auth.passTokenExpires = Date.now() + 3600000; // 1 hour
user.save();
return next(null,user.auth.passToken);
})
.catch( (err)=>{ return next(err,null); });
}
};