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

do not send welcome email if user already exists

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-09-28 19:23:07 +02:00
parent bfc7b9d3e8
commit d67b9e5688
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,9 @@ api.registerLocal = {
// Clean previous email preferences and send welcome email // Clean previous email preferences and send welcome email
EmailUnsubscription EmailUnsubscription
.remove({email: savedUser.auth.local.email}) .remove({email: savedUser.auth.local.email})
.then(() => sendTxnEmail(savedUser, 'welcome')); .then(() => {
if (!existingUser) sendTxnEmail(savedUser, 'welcome');
});
if (!existingUser) { if (!existingUser) {
res.analytics.track('register', { res.analytics.track('register', {
@@ -310,7 +312,9 @@ api.loginSocial = {
EmailUnsubscription EmailUnsubscription
.remove({email: savedUser.auth[network].emails[0].value.toLowerCase()}) .remove({email: savedUser.auth[network].emails[0].value.toLowerCase()})
.exec() .exec()
.then(() => sendTxnEmail(savedUser, 'welcome')); // eslint-disable-line max-nested-callbacks .then(() => {
if (!existingUser) sendTxnEmail(savedUser, 'welcome');
}); // eslint-disable-line max-nested-callbacks
} }
if (!existingUser) { if (!existingUser) {