Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

add username/email to user-delete event

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-10-04 11:08:01 -04:00
parent f9c882cb1d
commit 1bea247748
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/socket.io/admin/user.js
View File

@@ -163,12 +163,14 @@ function deleteUsers(socket, uids, method, callback) {
function (next) { function (next) {
method(uid, next); method(uid, next);
}, },
function (next) { function (userData, next) {
events.log({ events.log({
type: 'user-delete', type: 'user-delete',
uid: socket.uid, uid: socket.uid,
targetUid: uid, targetUid: uid,
ip: socket.ip, ip: socket.ip,
username: userData.username,
email: userData.email,
}, next); }, next);
}, },
function (next) { function (next) {

4
src/socket.io/user.js
View File

@@ -56,7 +56,7 @@ SocketUser.deleteAccount = function (socket, data, callback) {
} }
user.deleteAccount(socket.uid, next); user.deleteAccount(socket.uid, next);
}, },
function (next) { function (userData, next) {
require('./index').server.sockets.emit('event:user_status_change', { uid: socket.uid, status: 'offline' }); require('./index').server.sockets.emit('event:user_status_change', { uid: socket.uid, status: 'offline' });
events.log({ events.log({
@@ -64,6 +64,8 @@ SocketUser.deleteAccount = function (socket, data, callback) {
uid: socket.uid, uid: socket.uid,
targetUid: socket.uid, targetUid: socket.uid,
ip: socket.ip, ip: socket.ip,
username: userData.username,
email: userData.email,
}); });
next(); next();
}, },

8
src/user/delete.js
View File

@@ -22,7 +22,7 @@ module.exports = function (User) {
return setImmediate(callback, new Error('[[error:invalid-uid]]')); return setImmediate(callback, new Error('[[error:invalid-uid]]'));
} }
if (deletesInProgress[uid]) { if (deletesInProgress[uid]) {
return setImmediate(callback); return setImmediate(callback, new Error('[[error:already-deleting]]'));
} }
deletesInProgress[uid] = 'user.delete'; deletesInProgress[uid] = 'user.delete';
async.waterfall([ async.waterfall([
@@ -93,7 +93,7 @@ module.exports = function (User) {
User.deleteAccount = function (uid, callback) { User.deleteAccount = function (uid, callback) {
if (deletesInProgress[uid] === 'user.deleteAccount') { if (deletesInProgress[uid] === 'user.deleteAccount') {
return setImmediate(callback); return setImmediate(callback, new Error('[[error:already-deleting]]'));
} }
deletesInProgress[uid] = 'user.deleteAccount'; deletesInProgress[uid] = 'user.deleteAccount';
var userData; var userData;
@@ -107,7 +107,7 @@ module.exports = function (User) {
function (_userData, next) { function (_userData, next) {
if (!_userData || !_userData.username) { if (!_userData || !_userData.username) {
delete deletesInProgress[uid]; delete deletesInProgress[uid];
return callback(); return callback(new Error('[[error:no-user]]'));
} }
userData = _userData; userData = _userData;
plugins.fireHook('static:user.delete', { uid: uid }, next); plugins.fireHook('static:user.delete', { uid: uid }, next);
@@ -184,7 +184,7 @@ module.exports = function (User) {
}, },
], function (err) { ], function (err) {
delete deletesInProgress[uid]; delete deletesInProgress[uid];
callback(err); callback(err, userData);
}); });
}; };

2
test/uploads.js
View File

@@ -237,7 +237,7 @@ describe('Upload Controllers', function () {
user.delete(1, uid, next); user.delete(1, uid, next);
}, },
function (next) { function (userData, next) {
var filePath = path.join(nconf.get('upload_path'), url.replace('/assets/uploads', '')); var filePath = path.join(nconf.get('upload_path'), url.replace('/assets/uploads', ''));
file.exists(filePath, next); file.exists(filePath, next);
}, },