jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make ADMIN_GROUP_ID a constant

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-09-20 15:07:11 -07:00
parent 7fde57f7de
commit 9a000ddaf0
10 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/groups.js
View File

@@ -16,12 +16,11 @@ exports = module.exports = {
isMember: isMember,
getGroups: getGroups,
setGroups: setGroups,
ADMIN_GROUP_ID: 'admin' // see db migration code and groupdb._clear
setGroups: setGroups
};
var assert = require('assert'),
constants = require('./constants.js'),
DatabaseError = require('./databaseerror.js'),
groupdb = require('./groupdb.js'),
util = require('util');
@@ -88,7 +87,7 @@ function remove(id, callback) {
assert.strictEqual(typeof callback, 'function');
// never allow admin group to be deleted
if (id === exports.ADMIN_GROUP_ID) return callback(new GroupError(GroupError.NOT_ALLOWED));
if (id === constants.ADMIN_GROUP_ID) return callback(new GroupError(GroupError.NOT_ALLOWED));
groupdb.del(id, function (error) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));