Skip to content

Commit aefa8ac

Browse files
authored
Merge pull request makinhs#21 from TylerByte666/master
Fix Issue:makinhs#20 Wrong ADMIN_PERMISSION
2 parents 73d0e23 + a5d275c commit aefa8ac

File tree

2 files changed

+71
-230
lines changed

2 files changed

+71
-230
lines changed

common/middlewares/auth.permission.middleware.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const jwt = require('jsonwebtoken'),
2-
secret = require('../config/env.config')['jwt_secret'];
3-
4-
const ADMIN_PERMISSION = 4096;
2+
secret = require('../config/env.config')['jwt_secret'];
3+
const ADMIN_PERMISSION = require('../config/env.config')['permissionLevels']['ADMIN'];
54

65
exports.minimumPermissionLevelRequired = (required_permission_level) => {
76
return (req, res, next) => {
@@ -16,7 +15,6 @@ exports.minimumPermissionLevelRequired = (required_permission_level) => {
1615
};
1716

1817
exports.onlySameUserOrAdminCanDoThisAction = (req, res, next) => {
19-
2018
let user_permission_level = parseInt(req.jwt.permissionLevel);
2119
let userId = req.jwt.userId;
2220
if (req.params && req.params.userId && userId === req.params.userId) {
@@ -33,11 +31,9 @@ exports.onlySameUserOrAdminCanDoThisAction = (req, res, next) => {
3331

3432
exports.sameUserCantDoThisAction = (req, res, next) => {
3533
let userId = req.jwt.userId;
36-
3734
if (req.params.userId !== userId) {
3835
return next();
3936
} else {
4037
return res.status(400).send();
4138
}
42-
4339
};

0 commit comments

Comments
 (0)