diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index 3d0a114695..31fa107cfb 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -222,11 +222,33 @@ User.deleteInvitation = function (socket, data, callback) { }; User.acceptRegistration = function (socket, data, callback) { - user.acceptRegistration(data.username, callback); + user.acceptRegistration(data.username, function (err, uid) { + if (err) { + return callback(err); + } + events.log({ + type: 'registration-approved', + uid: socket.uid, + ip: socket.ip, + targetUid: uid, + }); + callback(); + }); }; User.rejectRegistration = function (socket, data, callback) { - user.rejectRegistration(data.username, callback); + user.rejectRegistration(data.username, function (err) { + if (err) { + return callback(err); + } + events.log({ + type: 'registration-rejected', + uid: socket.uid, + ip: socket.ip, + username: data.username, + }); + callback(); + }); }; User.restartJobs = function (socket, data, callback) { diff --git a/src/user/approval.js b/src/user/approval.js index ac54bcfc67..e09e6431ff 100644 --- a/src/user/approval.js +++ b/src/user/approval.js @@ -97,6 +97,9 @@ module.exports = function (User) { }, function (next) { markNotificationRead(username, next); + }, + function (next) { + next(null, uid); } ], callback); };