Skip to content

Commit 5ccfb7a

Browse files
authored
Merge pull request #77 from imcaizheng/fix-permission-rules
fix permission rules as per issue #72
2 parents 421d2a2 + e37f001 commit 5ccfb7a

12 files changed

+2781
-86
lines changed

app-constants.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
*/
44

55
const UserRoles = {
6-
BookingManager: 'bookingmanager'
6+
BookingManager: 'bookingmanager',
7+
Administrator: 'administrator',
8+
ConnectManager: 'Connect Manager'
79
}
810

11+
const FullManagePermissionRoles = [
12+
UserRoles.BookingManager,
13+
UserRoles.Administrator
14+
]
15+
916
const Scopes = {
1017
// job
1118
READ_JOB: 'read:taas-jobs',
@@ -31,5 +38,6 @@ const Scopes = {
3138

3239
module.exports = {
3340
UserRoles,
41+
FullManagePermissionRoles,
3442
Scopes
3543
}

app-routes.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ module.exports = (app) => {
4949
}
5050
} else {
5151
req.authUser.jwtToken = req.headers.authorization
52-
if (_.includes(req.authUser.roles, constants.UserRoles.BookingManager)) {
53-
req.authUser.isBookingManager = true
52+
// check if user has full manage permission
53+
if (_.intersection(req.authUser.roles, constants.FullManagePermissionRoles).length) {
54+
req.authUser.hasManagePermission = true
55+
}
56+
if (_.includes(req.authUser.roles, constants.UserRoles.ConnectManager)) {
57+
req.authUser.isConnectManager = true
5458
}
5559
next()
5660
}

0 commit comments

Comments
 (0)