public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some refactoring to aling it more with IVIS and coreui theme.

Browse source
This commit is contained in:
Tomas Bures 2019-01-05 23:56:16 +01:00
parent 397f85dac4
commit c1731bf09f
50 changed files with 1427 additions and 2351 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/models/users.js
View file

@ -264,7 +264,7 @@ async function getByUsername(username) {
async function getByUsernameIfPasswordMatch(context, username, password) {
try {
const user = await _getBy('username', username, ['password']);
const user = await _getBy(context, 'username', username, ['password']);
if (!await bcryptCompare(password, user.password)) {
throw new interoperableErrors.IncorrectPasswordError();
@ -324,7 +324,7 @@ async function sendPasswordReset(locale, usernameOrEmail) {
title: tUI('mailtrain', locale),
username: user.username,
name: user.name,
confirmUrl: getTrustedUrl(`/account/reset/${encodeURIComponent(user.username)}/${encodeURIComponent(resetToken)}`)
confirmUrl: getTrustedUrl(`login/reset/${encodeURIComponent(user.username)}/${encodeURIComponent(resetToken)}`)
}
});
}