Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and moving text strings to a locale object

Browse Source
This commit is contained in:
Victor Piousbox
2016-03-19 17:37:08 +00:00
parent e9a355a60b
commit d2c1c2cec6
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/api-v3/user.js
+11 -5
View File
@@ -104,7 +104,7 @@ api.resetPassword = {
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let email = req.body.email && req.body.email.toLowerCase();
let email = req.body.email.toLowerCase();
let salt = passwordUtils.makeSalt();
let newPassword = passwordUtils.makeSalt(); // use a salt as the new password too (they'll change it later)
let hashedPassword = passwordUtils.encrypt(newPassword, salt);
@@ -117,13 +117,19 @@ api.resetPassword = {
sendEmail({
from: 'Habitica <admin@habitica.com>',
to: email,
subject: 'Password Reset for Habitica',
text: `Password for ${user.auth.local.username} has been reset to ${newPassword} . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at ${nconf.get('BASE_URL')}. After you have logged in, head to ${nconf.get('BASE_URL')}/#/options/settings/settings and change your password.`,
html: `Password for <strong>${user.auth.local.username}</strong> has been reset to <strong>${newPassword}</strong><br /><br />Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.<br /><br />Log in at ${nconf.get('BASE_URL')}. After you have logged in, head to ${nconf.get('BASE_URL')}/#/options/settings/settings and change your password.`,
subject: res.t('passwordResetEmailSubject'),
text: res.t('passwordResetEmailText', { username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
html: res.t('passwordResetEmailHtml', { username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
});
await user.save();
}
res.respond(300, { message: res.t('passwordReset') });
res.respond(200, { message: res.t('passwordReset') });
},
};