Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 05:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

admin cleanup

Browse Source 
removed unnecessary admin checks in src/admin/user then realized they
are just one liners so moved them to src/socket.io.admin.js moved
categories update to categories folder
This commit is contained in:
barisusakli
2014-04-01 17:12:03 -04:00
parent ac88b5fc25
commit 10f56faf9d
6 changed files with 67 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/socket.io/admin.js
View File

@@ -9,12 +9,8 @@ var groups = require('../groups'),
categories = require('../categories'),
CategoryTools = require('../categoryTools'),
logger = require('../logger'),
events = require('../events'),
db = require('../database'),
admin = {
user: require('../admin/user'),
categories: require('../admin/categories')
},
async = require('async'),
winston = require('winston'),
index = require('./index'),
@@ -32,9 +28,8 @@ var groups = require('../groups'),
};
SocketAdmin.before = function(socket, next) {
// Verify administrative privileges
user.isAdministrator(socket.uid, function(err, isAdmin) {
if (isAdmin) {
if (!err && isAdmin) {
next();
} else {
winston.warn('[socket.io] Call to admin method blocked (accessed by uid ' + socket.uid + ')');
@@ -74,24 +69,32 @@ SocketAdmin.fireEvent = function(socket, data, callback) {
};
/* User */
SocketAdmin.user.makeAdmin = function(socket, theirid) {
admin.user.makeAdmin(socket.uid, theirid, socket);
SocketAdmin.user.makeAdmin = function(socket, theirid, callback) {
groups.join('administrators', theirid, callback);
};
SocketAdmin.user.removeAdmin = function(socket, theirid) {
admin.user.removeAdmin(socket.uid, theirid, socket);
SocketAdmin.user.removeAdmin = function(socket, theirid, callback) {
groups.leave('administrators', theirid, callback);
};
SocketAdmin.user.createUser = function(socket, user, callback) {
if(!user) {
SocketAdmin.user.createUser = function(socket, userData, callback) {
if (!userData) {
return callback(new Error('invalid data'));
}
admin.user.createUser(socket.uid, user, callback);
user.create(userData, callback);
};
SocketAdmin.user.banUser = function(socket, theirid) {
admin.user.banUser(socket.uid, theirid, socket, function(isBanned) {
if(isBanned) {
SocketAdmin.user.banUser = function(socket, theirid, callback) {
user.isAdministrator(theirid, function(err, isAdmin) {
if (err || isAdmin) {
return callback(err || new Error('You can\'t ban other admins!'));
}
user.ban(theirid, function(err) {
if (err) {
return callback(err);
}
var sockets = index.getUserSockets(theirid);
for(var i=0; i<sockets.length; ++i) {
@@ -99,16 +102,26 @@ SocketAdmin.user.banUser = function(socket, theirid) {
}
module.parent.exports.logoutUser(theirid);
}
callback();
});
});
};
SocketAdmin.user.unbanUser = function(socket, theirid) {
admin.user.unbanUser(socket.uid, theirid, socket);
SocketAdmin.user.unbanUser = function(socket, theirid, callback) {
user.unban(theirid, callback);
};
SocketAdmin.user.deleteUser = function(socket, theirid, callback) {
admin.user.deleteUser(socket.uid, theirid, callback);
user.delete(theirid, function(err) {
if (err) {
return callback(err);
}
events.logAdminUserDelete(socket.uid, theirid);
module.parent.exports.logoutUser(theirid);
callback();
});
};
SocketAdmin.user.search = function(socket, username, callback) {
@@ -144,7 +157,7 @@ SocketAdmin.categories.update = function(socket, data, callback) {
return callback(new Error('invalid data'));
}
admin.categories.update(data, socket, callback);
categories.update(data, callback);
};
SocketAdmin.categories.search = function(socket, data, callback) {