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

WIP admin.js socket underping

Browse Source
This commit is contained in:
Julian Lam
2014-01-16 15:00:49 -05:00
parent d234dbdca2
commit 4184574164
2 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/forum/admin/categories.js
View File

@@ -223,7 +223,10 @@ define(['uploader'], function(uploader) {
clearTimeout(searchDelay); clearTimeout(searchDelay);
searchDelay = setTimeout(function() { searchDelay = setTimeout(function() {
socket.emit('api:admin.categories.search', searchEl.value, cid, function(err, results) { socket.emit('api:admin.categories.search', {
username: searchEl.value,
cid: cid
}, function(err, results) {
var numResults = results.length, var numResults = results.length,
resultObj; resultObj;
for(var x=0;x<numResults;x++) { for(var x=0;x<numResults;x++) {
@@ -254,7 +257,12 @@ define(['uploader'], function(uploader) {
privilege = this.getAttribute('data-priv'); privilege = this.getAttribute('data-priv');
e.preventDefault(); e.preventDefault();
socket.emit('api:admin.categories.setPrivilege', cid, uid, privilege, !btnEl.hasClass('active'), function(err, privileges) { socket.emit('api:admin.categories.setPrivilege', {
cid: cid,
uid: uid,
privilege: privilege,
set: !btnEl.hasClass('active')
}, function(err, privileges) {
btnEl.toggleClass('active', privileges[privilege]); btnEl.toggleClass('active', privileges[privilege]);
Categories.refreshPrivilegeList(cid); Categories.refreshPrivilegeList(cid);

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

@@ -18,13 +18,13 @@ var groups = require('../groups'),
SocketAdmin = {}; SocketAdmin = {};
SocketAdmin.before = function(sessionData, next) { SocketAdmin.before = function(socket, next) {
// Verify administrative privileges // Verify administrative privileges
user.isAdministrator(sessionData.uid, function(err, isAdmin) { user.isAdministrator(socket.uid, function(err, isAdmin) {
if (isAdmin) { if (isAdmin) {
next(); next();
} else { } else {
winston.warn('[socket.io] Call to admin method blocked (accessed by uid ' + sessionData.uid + ')'); winston.warn('[socket.io] Call to admin method blocked (accessed by uid ' + socket.uid + ')');
} }
}); });
}; };
@@ -33,7 +33,7 @@ SocketAdmin.before = function(sessionData, next) {
SocketAdmin.topics = {}; SocketAdmin.topics = {};
SocketAdmin.topics.getMore = function(data, callback) { SocketAdmin.topics.getMore = function(socket, data, callback) {
topics.getAllTopics(data.limit, data.after, function(err, topics) { topics.getAllTopics(data.limit, data.after, function(err, topics) {
callback(JSON.stringify(topics)); callback(JSON.stringify(topics));
}); });
@@ -43,44 +43,36 @@ SocketAdmin.topics.getMore = function(data, callback) {
SocketAdmin.user = {}; SocketAdmin.user = {};
SocketAdmin.user.makeAdmin = function(theirid, sessionData) { SocketAdmin.user.makeAdmin = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.makeAdmin(socket.uid, theirid, socket);
admin.user.makeAdmin(sessionData.uid, theirid, sessionData.socket);
}
}; };
SocketAdmin.user.removeAdmin = function(theirid, sessionData) { SocketAdmin.user.removeAdmin = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.removeAdmin(socket.uid, theirid, socket);
admin.user.removeAdmin(sessionData.uid, theirid, sessionData.socket);
}
}; };
SocketAdmin.user.createUser = function(user, callback, sessionData) { SocketAdmin.user.createUser = function(socket, user, callback) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.createUser(socket.uid, user, callback);
admin.user.createUser(sessionData.uid, user, callback);
}
}; };
SocketAdmin.user.banUser = function(theirid, sessionData) { SocketAdmin.user.banUser = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.banUser(socket.uid, theirid, socket, function(isBanned) {
admin.user.banUser(sessionData.uid, theirid, sessionData.socket, function(isBanned) {
if(isBanned) { if(isBanned) {
if(sessionData.userSockets[theirid]) { if(socket.userSockets[theirid]) {
for(var i=0; i<sessionData.userSockets[theirid].length; ++i) { for(var i=0; i<socket.userSockets[theirid].length; ++i) {
sessionData.userSockets[theirid][i].emit('event:banned'); socket.userSockets[theirid][i].emit('event:banned');
} }
} }
module.parent.exports.logoutUser(theirid); module.parent.exports.logoutUser(theirid);
} }
}); });
}
}; };
SocketAdmin.user.unbanUser = function(theirid, sessionData) { SocketAdmin.user.unbanUser = function(socket, theirid) {
admin.user.unbanUser(sessionData.uid, theirid, sessionData.socket); admin.user.unbanUser(socket.uid, theirid, socket);
}; };
SocketAdmin.user.search = function(username, callback, sessionData) { SocketAdmin.user.search = function(socket, username, callback) {
user.search(username, function(data) { user.search(username, function(data) {
function isAdmin(userData, next) { function isAdmin(userData, next) {
user.isAdministrator(userData.uid, function(err, isAdmin) { user.isAdministrator(userData.uid, function(err, isAdmin) {
@@ -107,17 +99,20 @@ SocketAdmin.user.search = function(username, callback, sessionData) {
SocketAdmin.categories = {}; SocketAdmin.categories = {};
SocketAdmin.categories.create = function(data, callback) { SocketAdmin.categories.create = function(socket, data, callback) {
categories.create(data, function(err, data) { categories.create(data, function(err, data) {
callback(err, data); callback(err, data);
}); });
}; };
SocketAdmin.categories.update = function(data, sessionData) { SocketAdmin.categories.update = function(socket, data) {
admin.categories.update(data, sessionData.socket); admin.categories.update(data, socket);
}; };
SocketAdmin.categories.search = function(username, cid, callback, sessionData) { SocketAdmin.categories.search = function(socket, data, callback) {
var username = data.username,
cid = data.cid;
user.search(username, function(data) { user.search(username, function(data) {
async.map(data, function(userObj, next) { async.map(data, function(userObj, next) {
CategoryTools.privileges(cid, userObj.uid, function(err, privileges) { CategoryTools.privileges(cid, userObj.uid, function(err, privileges) {
@@ -131,7 +126,7 @@ SocketAdmin.categories.search = function(username, cid, callback, sessionData) {
}); });
}, function(err, data) { }, function(err, data) {
if (!callback) { if (!callback) {
sessionData.socket.emit('api:admin.categories.search', data); socket.emit('api:admin.categories.search', data);
} else { } else {
callback(null, data); callback(null, data);
} }
@@ -139,8 +134,12 @@ SocketAdmin.categories.search = function(username, cid, callback, sessionData) {
}); });
}; };
SocketAdmin.categories.setPrivilege = function(cid, uid, privilege, set, callback) { SocketAdmin.categories.setPrivilege = function(socket, data, callback) {
var cb = function(err) { var cid = data.cid,
uid = data.uid,
privilege = data.privilege,
set = data.set,
cb = function(err) {
CategoryTools.privileges(cid, uid, callback); CategoryTools.privileges(cid, uid, callback);
}; };