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

Make users-test work

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-02-14 13:01:51 -08:00
parent c8000fdf90
commit 028852740d
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/users.js
View File

@@ -443,18 +443,16 @@ function updateUser(user, data, auditSource, callback) {
userdb.update(user.id, data, function (error) {
if (error) return callback(error);
get(user.id, function (error, result) {
if (error) return callback(error);
const newUser = _.extend({}, user, data);
eventlog.add(eventlog.ACTION_USER_UPDATE, auditSource, {
userId: user.id,
user: removePrivateFields(result),
adminStatusChanged: ((result.admin && !user.admin) || (!result.admin && user.admin)),
activeStatusChanged: ((result.active && !user.active) || (!result.active && user.active))
});
callback(null);
eventlog.add(eventlog.ACTION_USER_UPDATE, auditSource, {
userId: user.id,
user: removePrivateFields(newUser),
adminStatusChanged: ((newUser.admin && !user.admin) || (!newUser.admin && user.admin)),
activeStatusChanged: ((newUser.active && !user.active) || (!newUser.active && user.active))
});
callback(null);
});
}