krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Sabe Jones
2019-04-25 13:55:17 -05:00
parent 1b93f20451 a4a8ac6c5e
commit cbb04d221d
7 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/controllers/api-v3/auth.js
View File

@@ -99,7 +99,7 @@ api.loginLocal = {
let user = await User.findOne(login).exec();
// if user is using social login, then user will not have a hashed_password stored
if (!user.auth.local.hashed_password) throw new NotAuthorized(res.t('invalidLoginCredentialsLong'));
if (!user || !user.auth.local.hashed_password) throw new NotAuthorized(res.t('invalidLoginCredentialsLong'));
let isValidPassword;