summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/lib/permissions/permissionhelper.js (renamed from server/lib/permissions/permissionutil.js)10
-rw-r--r--server/router.js4
2 files changed, 7 insertions, 7 deletions
diff --git a/server/lib/permissions/permissionutil.js b/server/lib/permissions/permissionhelper.js
index 8e91af9..db2fc35 100644
--- a/server/lib/permissions/permissionutil.js
+++ b/server/lib/permissions/permissionhelper.js
@@ -1,7 +1,7 @@
/* global __appdir */
const path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
-var groupUtil = require(path.join(__appdir, 'lib', 'grouputil'))
+var groupHelper = require(path.join(__appdir, 'lib', 'grouphelper'))
module.exports = { exportFunctions }
@@ -71,8 +71,8 @@ async function getAllowedGroups (userid, permissionName) {
}
// Get childs of white and blacklist groups
- var whiteSubChilds = await groupUtil.getAllChildren(whitelist)
- var blackSubChilds = await groupUtil.getAllChildren(blacklist)
+ var whiteSubChilds = await groupHelper.getAllChildren(whitelist)
+ var blackSubChilds = await groupHelper.getAllChildren(blacklist)
// Add all whitelist-ids to result.
permGrps = permGrps.concat(whitelist.map(x => x.id))
@@ -162,8 +162,8 @@ async function getAllowedClients (userid, permissionName) {
}
// Get childs of white and blacklist groups
- var whiteSubChilds = await groupUtil.getAllChildren(whitelist)
- var blackSubChilds = await groupUtil.getAllChildren(blacklist)
+ var whiteSubChilds = await groupHelper.getAllChildren(whitelist)
+ var blackSubChilds = await groupHelper.getAllChildren(blacklist)
// Add all whitelist-ids to result.
permClients = permClients.concat(whiteSubChilds.clients.map(s => s.id))
diff --git a/server/router.js b/server/router.js
index 4aa7e54..076a15c 100644
--- a/server/router.js
+++ b/server/router.js
@@ -2,7 +2,7 @@ var express = require('express')
var router = express.Router()
var path = require('path')
var fs = require('fs')
-var permUtil = require(path.join(__dirname, 'lib', 'permissions', 'permissionutil'))
+var permissionHelper = require(path.join(__dirname, 'lib', 'permissions', 'permissionhelper'))
var auth = require(path.join(__dirname, 'lib', 'authentication'))
// Forward routing to every api module with /<api>/...
@@ -11,7 +11,7 @@ fs.readdirSync(path.join(__dirname, 'api')).forEach(filename => {
// Public callable functions.
if (api.noAuthRouter) router.use('/' + filename.split('.')[0] + '/', api.noAuthRouter)
// Authentication needed
- if (api.router) router.use('/' + filename.split('.')[0] + '/', auth.verifyToken, permUtil.exportFunctions, api.router)
+ if (api.router) router.use('/' + filename.split('.')[0] + '/', auth.verifyToken, permissionHelper.exportFunctions, api.router)
})
router.use('*', (req, res) => {