added isOwner

src/socket.io/groups.js

@@ -50,92 +50,61 @@ SocketGroups.leave = function(socket, data, callback) {
 	groups.leave(data.groupName, socket.uid, callback);
 };
 
-SocketGroups.grant = function(socket, data, callback) {
+function isOwner(next) {
+	return function (socket, data, callback) {
 		groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (!isOwner) {
+			if (err || !isOwner) {
-			return callback(new Error('[[error:no-privileges]]'));
+				return callback(err || new Error('[[error:no-privileges]]'));
 			}
-
+			next(socket, data, callback);
-		groups.ownership.grant(data.toUid, data.groupName, callback);
 		});
-};
+	};
+}
 
-SocketGroups.rescind = function(socket, data, callback) {
+SocketGroups.grant = isOwner(function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
+	groups.ownership.grant(data.toUid, data.groupName, callback);
-		if (!isOwner) {
+});
-			return callback(new Error('[[error:no-privileges]]'));
-		}
 
+SocketGroups.rescind = isOwner(function(socket, data, callback) {
 	groups.ownership.rescind(data.toUid, data.groupName, callback);
-	});
+});
-};
-
-SocketGroups.accept = function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (!isOwner) {
-			return callback(new Error('[[error:no-privileges]]'));
-		}
 
+SocketGroups.accept = isOwner(function(socket, data, callback) {
 	groups.acceptMembership(data.groupName, data.toUid, callback);
-	});
+});
-};
-
-SocketGroups.reject = function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (!isOwner) {
-			return callback(new Error('[[error:no-privileges]]'));
-		}
 
+SocketGroups.reject = isOwner(function(socket, data, callback) {
 	groups.rejectMembership(data.groupName, data.toUid, callback);
-	});
+});
-};
 
-SocketGroups.acceptAll = function(socket, data, callback) {
+SocketGroups.acceptAll = isOwner(function(socket, data, callback) {
-	acceptRejectAll('accept', socket, data, callback);
+	acceptRejectAll(groups.acceptMembership, socket, data, callback);
-};
+});
 
-SocketGroups.rejectAll = function(socket, data, callback) {
+SocketGroups.rejectAll = isOwner(function(socket, data, callback) {
-	acceptRejectAll('reject', socket, data, callback);
+	acceptRejectAll(groups.rejectMembership, socket, data, callback);
-};
+});
 
-function acceptRejectAll(type, socket, data, callback) {
+function acceptRejectAll(method, socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (err || !isOwner) {
-			return callback(err || new Error('[[error:no-privileges]]'));
-		}
 	async.waterfall([
 		function(next) {
 			groups.getPending(data.groupName, next);
 		},
 		function(uids, next) {
-				var method = type === 'accept' ? groups.acceptMembership : groups.rejectMembership;
 			async.each(uids, function(uid, next) {
 				method(data.groupName, uid, next);
 			}, next);
 		}
 	], callback);
-	});
 }
 
-SocketGroups.issueInvite = function(socket, data, callback) {
+SocketGroups.issueInvite = isOwner(function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (err || !isOwner) {
-			return callback(err || new Error('[[error:no-privileges]]'));
-		}
-
 	groups.invite(data.groupName, data.toUid, callback);
-	});
+});
-};
-
-SocketGroups.rescindInvite = function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (err || !isOwner) {
-			return callback(err || new Error('[[error:no-privileges]]'));
-		}
 
+SocketGroups.rescindInvite = isOwner(function(socket, data, callback) {
 	groups.rejectMembership(data.groupName, data.toUid, callback);
-	});
+});
-};
 
 SocketGroups.acceptInvite = function(socket, data, callback) {
 	groups.isInvited(socket.uid, data.groupName, function(err, invited) {
@@ -157,15 +126,15 @@ SocketGroups.rejectInvite = function(socket, data, callback) {
 	});
 };
 
-SocketGroups.update = function(socket, data, callback) {
+SocketGroups.update = isOwner(function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (err || !isOwner) {
-			return callback(err || new Error('[[error:no-privileges]]'));
-		}
-
 	groups.update(data.groupName, data.values, callback);
-	});
+});
-};
+
+
+SocketGroups.kick = isOwner(function(socket, data, callback) {
+	groups.leave(data.groupName, data.uid, callback);
+});
+
 
 SocketGroups.create = function(socket, data, callback) {
 	if (!socket.uid) {
@@ -245,16 +214,6 @@ SocketGroups.loadMoreMembers = function(socket, data, callback) {
 	});
 };
 
-SocketGroups.kick = function(socket, data, callback) {
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (!isOwner) {
-			return callback(new Error('[[error:no-privileges]]'));
-		}
-
-		groups.leave(data.groupName, data.uid, callback);
-	});
-};
-
 SocketGroups.cover = {};
 
 SocketGroups.cover.get = function(socket, data, callback) {