jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Split up userAdd and sendInvite mailer calls

Browse Source
This commit is contained in:
Johannes Zellner
2016-01-18 16:11:00 +01:00
parent 46878e4363
commit c5b8b0e3db
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/user.js
View File

@@ -157,7 +157,9 @@ function createUser(username, password, email, admin, invitor, sendInvite, callb
callback(null, user);
if (sendInvite) mailer.userAdded(user, invitor);
// do not send email for admins (this can only be the case for the owner)
if (!admin) mailer.userAdded(user);
if (sendInvite) mailer.sendInvite(user, invitor);
});
});
});
@@ -416,7 +418,7 @@ function sendInvite(userId, callback) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND));
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
mailer.userAdded(userObject, null);
mailer.sendInvite(userObject, null);
callback(null);
});