summaryrefslogtreecommitdiffstats
path: root/server/lib/permissions
diff options
context:
space:
mode:
authorJannik Schönartz2019-03-07 20:20:25 +0100
committerJannik Schönartz2019-03-07 20:20:25 +0100
commit0999302d99156200ff174d5ec56d6831c8afd332 (patch)
tree56dfcf175c3d5b15dd44eb8d156e4448caaa5455 /server/lib/permissions
parent[server/ipranges] Forgot to commit the lib. ¯\_(ツ)_/¯ (diff)
downloadbas-0999302d99156200ff174d5ec56d6831c8afd332.tar.gz
bas-0999302d99156200ff174d5ec56d6831c8afd332.tar.xz
bas-0999302d99156200ff174d5ec56d6831c8afd332.zip
[server] New clients are automaticly added to the groups of the fitting subranges
Add conflict models Sequelize string operators depricated fix IPv4 is now saved as decimal in the database Add host to config instead of hardcoding Rename ip.js lib to iphelper.js
Diffstat (limited to 'server/lib/permissions')
-rw-r--r--server/lib/permissions/index.js2
-rw-r--r--server/lib/permissions/permissionutil.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/permissions/index.js b/server/lib/permissions/index.js
index 79ce6b1..a0af9d4 100644
--- a/server/lib/permissions/index.js
+++ b/server/lib/permissions/index.js
@@ -19,7 +19,7 @@ function updatePermissionDatabase () {
// Delete entries from Database which are not in the permission.json
db.permission.destroy(
- { where: { $not: { name: permissionNames } } }
+ { where: { [db.Op.not]: { name: permissionNames } } }
)
}
diff --git a/server/lib/permissions/permissionutil.js b/server/lib/permissions/permissionutil.js
index 532af6c..8e91af9 100644
--- a/server/lib/permissions/permissionutil.js
+++ b/server/lib/permissions/permissionutil.js
@@ -31,7 +31,7 @@ async function hasPermission (userid, permissionName) {
var user
if (permission[1] === '*') {
user = await db.user.findOne({
- where: { id: userid, '$roles.permissions.name$': { $like: permission[0] + '%' } },
+ where: { id: userid, '$roles.permissions.name$': { [db.Op.like]: permission[0] + '%' } },
include: [{ as: 'roles', model: db.role, include: ['permissions'] }]
})
} else {