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

Only send out mails if the admin group has changed

Browse Source
This commit is contained in:
Johannes Zellner
2016-05-04 13:54:32 +02:00
parent d2a1cea1e8
commit 778371b818
2 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/user.js
View File

@@ -339,19 +339,28 @@ function setGroups(userId, groupIds, callback) {
assert(Array.isArray(groupIds));
assert.strictEqual(typeof callback, 'function');
groups.setGroups(userId, groupIds, function (error) {
if (error && error.reason === GroupError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND, 'One or more groups not found'));
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
groups.getGroups(userId, function (error, oldGroupIds) {
if (error && error.reason !== GroupError.NOT_FOUND) return callback(new UserError(UserError.INTERNAL_ERROR, error));
if (groupIds.some(function (g) { return g === groups.ADMIN_GROUP_ID; })) {
getUser(userId, function (error, result) {
if (error) return console.error('Failed to send admin change mail.', error);
oldGroupIds = oldGroupIds || [];
mailer.adminChanged(result, true);
});
}
groups.setGroups(userId, groupIds, function (error) {
if (error && error.reason === GroupError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND, 'One or more groups not found'));
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
callback();
var isAdmin = groupIds.some(function (g) { return g === groups.ADMIN_GROUP_ID; });
var wasAdmin = oldGroupIds.some(function (g) { return g === groups.ADMIN_GROUP_ID; });
if ((isAdmin && !wasAdmin) || (!isAdmin && wasAdmin)) {
getUser(userId, function (error, result) {
if (error) return console.error('Failed to send admin change mail.', error);
mailer.adminChanged(result, isAdmin);
});
}
callback(null);
});
});
}