Make admin simply a boolean instead of group

This simplifies a lot of logic. Keeping an admin group has no benefit
This commit is contained in:
Girish Ramakrishnan
2018-07-26 17:17:52 -07:00
parent 39848a25a8
commit 78a2176d1d
18 changed files with 280 additions and 359 deletions
+1 -4
View File
@@ -85,7 +85,6 @@ var appdb = require('./appdb.js'),
TransformStream = require('stream').Transform,
updateChecker = require('./updatechecker.js'),
url = require('url'),
users = require('./users.js'),
util = require('util'),
uuid = require('uuid'),
validator = require('validator'),
@@ -358,9 +357,7 @@ function hasAccessTo(app, user, callback) {
// check user access
if (app.accessRestriction.users.some(function (e) { return e === user.id; })) return callback(null, true);
const isAdmin = users.isAdmin(user);
if (isAdmin) return callback(null, true); // admins can always access any app
if (user.admin) return callback(null, true); // admins can always access any app
if (!app.accessRestriction.groups) return callback(null, false);