no message
This commit is contained in:
@@ -6,6 +6,8 @@ const Token = require('../modules/token');
|
||||
|
||||
const secret = 'Creepily hooking the gays up since 2008!';
|
||||
|
||||
var logger = require('../modules/logger');
|
||||
|
||||
function generateHmac (userId, expires) {
|
||||
var string = String(userId) + '|' + String(expires);
|
||||
return Crypto.createHmac('sha1', secret).update(string).digest('hex');
|
||||
@@ -25,10 +27,10 @@ function sendMail (options, callback) {
|
||||
|
||||
callback = typeof callback === 'function' ? callback : (error, info) => {
|
||||
if (error) {
|
||||
return console.log(error);
|
||||
return logger.error(error);
|
||||
}
|
||||
|
||||
console.log('Message %s sent: %s', info.messageId, info.response);
|
||||
logger.debug('Message %s sent: %s', info.messageId, info.response);
|
||||
};
|
||||
|
||||
// send mail with defined transport object
|
||||
@@ -110,18 +112,18 @@ module.exports = {
|
||||
|
||||
sendMail(mail, (error, info) => {
|
||||
if (error) {
|
||||
console.log('[reset::forceReset] Message Send Error', { error: error });
|
||||
logger.debug('[reset::forceReset] Message Send Error', { error: error });
|
||||
forceResetMailResolve({ success: false, message: 'There was an error sending the message', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
console.log('[reset::forceReset] Message sent', { messageId: info.messageId, response: info.response, resetLink: resetLink });
|
||||
logger.debug('[reset::forceReset] Message sent', { messageId: info.messageId, response: info.response, resetLink: resetLink });
|
||||
forceResetMailResolve({ success: true, message: 'Message ' + info.messageId + ' sent: ' + info.response + '.' });
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('[reset::forceReset] There was an error creating the reset token.', { err: err });
|
||||
logger.debug('[reset::forceReset] There was an error creating the reset token.', { err: err });
|
||||
forceResetMailReject(err);
|
||||
});
|
||||
});
|
||||
@@ -184,14 +186,14 @@ module.exports = {
|
||||
if (e) {
|
||||
e.emit('markUsed', null, result);
|
||||
} else {
|
||||
console.log('[ResetModel::markUsed] Password reset token used', { token: result });
|
||||
logger.debug('[ResetModel::markUsed] Password reset token used', { token: result });
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
if (e) {
|
||||
e.emit('markUsed', err, null);
|
||||
} else {
|
||||
console.error('[ResetModel::markUsed] Error marking password reset token used', { token: err });
|
||||
logger.error('[ResetModel::markUsed] Error marking password reset token used', { token: err });
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -226,18 +228,18 @@ module.exports = {
|
||||
|
||||
sendMail(mail, (error, info) => {
|
||||
if (error) {
|
||||
console.log('[reset::sendNewUser] Message Send Error', { error: error });
|
||||
logger.error('[reset::sendNewUser] Message Send Error', { error: error });
|
||||
newUserMailResolve({ success: false, message: 'There was an error sending the message', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
console.log('[reset::sendNewUser] Message %s sent: %s', info.messageId, info.response);
|
||||
logger.debug('[reset::sendNewUser] Message %s sent: %s', info.messageId, info.response);
|
||||
newUserMailResolve({ success: true, message: 'Message ' + info.messageId + ' sent: ' + info.response + '.' });
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('[reset::sendNewUser] There was an error creating the reset token.', { err: err });
|
||||
logger.error('[reset::sendNewUser] There was an error creating the reset token.', { err: err });
|
||||
newUserMailReject(err);
|
||||
});
|
||||
});
|
||||
@@ -295,13 +297,13 @@ module.exports = {
|
||||
sendMail(mail, (err, info) => {
|
||||
if (err) {
|
||||
var error = { msg: '[reset::sendReset] There was an error sending the reset email.', err: err };
|
||||
console.log('[reset::sendReset] Message Send Error', { err: err });
|
||||
logger.error('[reset::sendReset] Message Send Error', { err: err });
|
||||
sendMailResolve({ success: false, message: 'There was an error requesting the password reset.', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
var message = 'Message ' + info.messageId + ' sent: ' + info.response + '.';
|
||||
console.log('[reset::sendReset] ' + message);
|
||||
logger.debug('[reset::sendReset] ' + message);
|
||||
sendMailResolve({ success: true, message: 'The password reset request was successfully completed.', response: message });
|
||||
}
|
||||
});
|
||||
@@ -316,7 +318,7 @@ module.exports = {
|
||||
})
|
||||
.catch((err) => {
|
||||
var error = { msg: '[reset::sendReset] There was an error creating the reset token.', err: err };
|
||||
console.log(error.msg, { err: err });
|
||||
logger.debug(error.msg, { err: err });
|
||||
e.emit('sendReset', null, { success: false, message: 'There was an error requesting the password reset.', error: error });
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user