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

Remove email addresses from translatable strings (#8448)

Browse Source 
* Fix User > Profile showing {getProgressDisplay()}

* Remove bad nextRewardAt check

* 1st iteration of issue #8385 - more pending

* #8385 config and jade fixes, tests pending

* #8385 fixing lint errors

* Fix faqs string and test

* Fix faq.jade and add workaround for faq.js

* Fixing accidental checking for faq.js

* fix emails in faq.js

* fetch emails once in auth.js

* Fixing community manager email in auth.js
This commit is contained in:
Gerardo Saca
2017-03-27 12:03:31 -04:00
committed by Matteo Pagliazzi
parent 5eadf9e486
commit 842fbe42a8
19 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,8 @@ import pusher from '../../libs/pusher';
import common from '../../../common';
const BASE_URL = nconf.get('BASE_URL');
const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL');
const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL');
let api = {};
@@ -183,7 +185,7 @@ api.registerLocal = {
};
function _loginRes (user, req, res) {
if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {userId: user._id}));
if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {communityManagerEmail: COMMUNITY_MANAGER_EMAIL, userId: user._id}));
return res.respond(200, {id: user._id, apiToken: user.apiToken, newUser: user.newUser || false});
}
@@ -610,7 +612,7 @@ api.updateEmail = {
'auth.local.email': req.body.newEmail,
}).select({_id: 1}).lean().exec();
if (emailAlreadyInUse) throw new NotAuthorized(res.t('cannotFulfillReq'));
if (emailAlreadyInUse) throw new NotAuthorized(res.t('cannotFulfillReq', { techAssistanceEmail: TECH_ASSISTANCE_EMAIL }));
let password = req.body.password;
let isValidPassword = await passwordUtils.compare(user, password);