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

fixes to administrator methods

Browse Source
This commit is contained in:
Julian Lam
2013-09-07 15:49:23 -04:00
parent 780cec2596
commit ce126b11fb
3 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/admin/user.js
View File

@@ -1,22 +1,28 @@
var RDB = require('./../redis.js'), var RDB = require('../redis'),
utils = require('./../../public/src/utils.js'), utils = require('../../public/src/utils'),
user = require('./../user.js'); user = require('../user'),
Groups = require('../groups');
(function(UserAdmin) { (function(UserAdmin) {
UserAdmin.makeAdmin = function(uid, theirid, socket) { UserAdmin.makeAdmin = function(uid, theirid, socket) {
user.isAdministrator(uid, function(isAdmin) { user.isAdministrator(uid, function(isAdmin) {
if(isAdmin) { if(isAdmin) {
user.makeAdministrator(theirid, function(data) { Groups.getGidFromName('Administrators', function(err, gid) {
socket.emit('event:alert', { Groups.join(gid, theirid, function(err) {
title: 'User Modified', if (!err) {
message: 'This user is now an administrator!', user.setUserField(theirid, 'administrator', 1);
type: 'success',
timeout: 2000 socket.emit('event:alert', {
}); title: 'User Modified',
message: 'This user is now an administrator!',
type: 'success',
timeout: 2000
});
}
});
}); });
} } else {
else {
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Warning', title: 'Warning',
message: 'You need to be an administrator to make someone else an administrator!', message: 'You need to be an administrator to make someone else an administrator!',
@@ -30,13 +36,18 @@ var RDB = require('./../redis.js'),
UserAdmin.removeAdmin = function(uid, theirid, socket) { UserAdmin.removeAdmin = function(uid, theirid, socket) {
user.isAdministrator(uid, function(isAdmin) { user.isAdministrator(uid, function(isAdmin) {
if(isAdmin) { if(isAdmin) {
user.removeAdministrator(theirid, function(data) { Groups.getGidFromName('Administrators', function(err, gid) {
Groups.leave(gid, theirid, function(err) {
if (!err) {
user.setUserField(theirid, 'administrator', 0);
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'User Modified', title: 'User Modified',
message: 'This user is no longer an administrator!', message: 'This user is no longer an administrator!',
type: 'success', type: 'success',
timeout: 2000 timeout: 2000
});
}
}); });
}); });
} }

34
src/install.js
View File

@@ -192,23 +192,31 @@ var async = require('async'),
hidden: true, hidden: true,
type: 'string' type: 'string'
} }
]; ],
getAdminInfo = function(callback) {
prompt.get(questions, function(err, results) {
if (!results) return callback(new Error('aborted'));
prompt.get(questions, function(err, results) { nconf.set('bcrypt_rounds', 12);
if (!results) return callback(new Error('aborted')); User.create(results.username, results.password, results.email, function(err, uid) {
if (err) {
winston.warn(err.message + ' Please try again.');
return getAdminInfo();
}
nconf.set('bcrypt_rounds', 12); Groups.getGidFromName('Administrators', function(err, gid) {
User.create(results.username, results.password, results.email, function(err, uid) { if (gid) Groups.join(gid, uid, callback);
Groups.getGidFromName('Administrators', function(err, gid) { else {
if (gid) Groups.join(gid, uid, callback); Groups.create('Administrators', 'Forum Administrators', function(err, groupObj) {
else { Groups.join(groupObj.gid, uid, callback);
Groups.create('Administrators', 'Forum Administrators', function(err, groupObj) { });
Groups.join(groupObj.gid, uid, callback); }
}); });
} });
}); });
}); };
});
getAdminInfo(callback);
}, },
save: function(server_conf, client_conf, callback) { save: function(server_conf, client_conf, callback) {
// Server Config // Server Config

34
src/user.js
View File

@@ -5,6 +5,7 @@ var utils = require('./../public/src/utils.js'),
meta = require('./meta.js'), meta = require('./meta.js'),
emailjsServer = emailjs.server.connect(meta.config.mailer || '127.0.0.1'), emailjsServer = emailjs.server.connect(meta.config.mailer || '127.0.0.1'),
bcrypt = require('bcrypt'), bcrypt = require('bcrypt'),
Groups = require('./groups'),
notifications = require('./notifications.js'), notifications = require('./notifications.js'),
topics = require('./topics.js'), topics = require('./topics.js'),
async = require('async'), async = require('async'),
@@ -769,35 +770,10 @@ var utils = require('./../public/src/utils.js'),
} }
User.isAdministrator = function(uid, callback) { User.isAdministrator = function(uid, callback) {
RDB.sismember('administrators', uid, function(err, exists) { Groups.getGidFromName('Administrators', function(err, gid) {
RDB.handle(err); Groups.isMember(uid, gid, function(err, isAdmin) {
callback(!!exists); callback(isAdmin);
}); });
}
User.makeAdministrator = function(uid, callback) {
RDB.sadd('administrators', uid, function(err, data){
if(!err) {
User.setUserField(uid, 'administrator', 1);
}
if(callback) {
// @todo address why we're only sending back a boolean in the callback and not an error if it occurred
callback(err === null);
}
});
}
User.removeAdministrator = function(uid, callback) {
RDB.srem('administrators', uid, function(err, data){
if(!err) {
User.setUserField(uid, 'administrator', 0);
}
if(callback) {
// @todo address why we're only sending back a boolean in the callback and not an error if it occurred
callback(err === null);
}
}); });
} }