support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden

src/admin/user.js

@@ -27,7 +27,7 @@ var utils = require('../../public/src/utils'),
 	UserAdmin.makeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(err, isAdmin) {
 			if (isAdmin) {
-				groups.getGidFromName('Administrators', function(err, gid) {
+				groups.getGidFromName('administrators', function(err, gid) {
 					groups.join(gid, theirid, function(err) {
 						if (!err) {
 							socket.emit('event:alert', {
@@ -53,7 +53,7 @@ var utils = require('../../public/src/utils'),
 	UserAdmin.removeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(err, isAdmin) {
 			if (isAdmin) {
-				groups.getGidFromName('Administrators', function(err, gid) {
+				groups.getGidFromName('administrators', function(err, gid) {
 					groups.leave(gid, theirid, function(err) {
 						if (!err) {
 

src/groups.js

@@ -28,6 +28,18 @@
 		});
 	};
 
+	Groups.listSystemGroups = function(options, callback) {
+		var	systemGroups = ['administrators', 'registered-users'],
+			humanNames = ['Administrators', 'Registered Users'];
+
+		async.map(systemGroups, function(groupName, next) {
+			Groups.getByGroupName(groupName, options, function(err, groupObj) {
+				groupObj['name'] = humanNames[systemGroups.indexOf(groupObj['name'])];
+				next(err, groupObj);
+			});
+		}, callback);
+	};
+
 	Groups.get = function(gid, options, callback) {
 		async.parallel({
 			base: function (next) {
@@ -199,7 +211,26 @@
 	Groups.update = function(gid, values, callback) {
 		db.exists('gid:' + gid, function (err, exists) {
 			if (!err && exists) {
-				db.setObject('gid:' + gid, values, callback);
+				// If the group was renamed, check for dupes, fix the assoc. hash
+				if (values['name']) {
+					Groups.exists(values['name'], function(err, exists) {
+						if (!exists) {
+							Groups.get(gid, {}, function(err, groupObj) {
+								if (err) {
+									return callback(new Error('group-not-found'));
+								}
+
+								db.deleteObjectField('group:gid', groupObj['name']);
+								db.setObjectField('group:gid', values['name'], gid);
+								db.setObject('gid:' + gid, values, callback);
+							});
+						} else {
+							callback(new Error('group-exists'));
+						}
+					});
+				} else {
+					db.setObject('gid:' + gid, values, callback);
+				}
 			} else {
 				if (callback) {
 					callback(new Error('gid-not-found'));

src/install.js

@@ -289,7 +289,7 @@ var async = require('async'),
 					// Check if an administrator needs to be created
 					var Groups = require('./groups');
 
-					Groups.getGidFromName('Administrators', function (err, gid) {
+					Groups.getGidFromName('administrators', function (err, gid) {
 						if (err) {
 							return next(err.message);
 						}
@@ -417,11 +417,11 @@ var async = require('async'),
 							return callback(new Error('invalid-values'));
 						}
 
-						Groups.getGidFromName('Administrators', function (err, gid) {
+						Groups.getGidFromName('administrators', function (err, gid) {
 							if (gid) {
 								Groups.join(gid, uid, callback);
 							} else {
-								Groups.create('Administrators', 'Forum Administrators', function (err, groupObj) {
+								Groups.create('administrators', 'Forum Administrators', function (err, groupObj) {
 									Groups.join(groupObj.gid, uid, callback);
 								});
 							}

src/socket.io/admin.js

@@ -211,11 +211,20 @@ SocketAdmin.categories.setGroupPrivilege = function(socket, data, callback) {
 };
 
 SocketAdmin.categories.groupsList = function(socket, cid, callback) {
-	groups.list({expand:false}, function(err, data){
+	async.parallel({
+		groups: function(next) {
+			groups.list({expand:false}, next);
+		},
+		system: function(next) {
+			groups.listSystemGroups({expand: false}, next);
+		}
+	}, function(err, results) {
 		if(err) {
 			return callback(err);
 		}
 
+		var	data = results.groups.concat(results.system);
+
 		async.map(data, function(groupObj, next) {
 			CategoryTools.groupPrivileges(cid, groupObj.gid, function(err, privileges) {
 				if(err) {

src/upgrade.js

@@ -17,7 +17,7 @@ var db = require('./database'),
 
 Upgrade.check = function(callback) {
 	// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
-	var	latestSchema = new Date(2014, 0, 19, 22, 19).getTime();
+	var	latestSchema = new Date(2014, 0, 23, 16, 5).getTime();
 
 	db.get('schemaDate', function(err, value) {
 		if (parseInt(value, 10) >= latestSchema) {
@@ -299,6 +299,25 @@ Upgrade.upgrade = function(callback) {
 				winston.info('[2014/1/19] Remove user search from Reds -- skipped');
 				next();
 			}
+		},
+		function(next) {
+			thisSchemaDate = new Date(2014, 0, 23, 16, 5).getTime();
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+
+				Groups.getByGroupName('Administrators', {}, function(err, groupObj) {
+					Groups.update(groupObj.gid, {
+						name: 'administrators',
+						hidden: '1'
+					}, function() {
+						winston.info('[2014/1/23] Updating Administrators Group');
+						next();
+					});
+				})
+			} else {
+				winston.info('[2014/1/23] Updating Administrators Group -- skipped');
+				next();
+			}
 		}
 		// Add new schema updates here
 		// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 17!!!

src/user.js

@@ -761,7 +761,7 @@ var bcrypt = require('bcrypt'),
 	};
 
 	User.isAdministrator = function(uid, callback) {
-		groups.getGidFromName('Administrators', function(err, gid) {
+		groups.getGidFromName('administrators', function(err, gid) {
 			if(err) {
 				return callback(err);
 			}