fix: root admin access deny bug + patreon link

This commit is contained in:
Nicolas Giard
2019-01-25 17:19:52 -05:00
committed by Nick
parent 8f573ffd01
commit 72253f9cb5
8 changed files with 19 additions and 19 deletions

View File

@@ -114,6 +114,7 @@ module.exports = {
try {
const newToken = await WIKI.models.users.refreshToken(jwtPayload.id)
user = newToken.user
req.user = user
// Try headers, otherwise cookies for response
if (req.get('content-type') === 'application/json') {
@@ -153,20 +154,18 @@ module.exports = {
* @param {String|Boolean} path
*/
checkAccess(user, permissions = [], page = false) {
const userPermissions = user.permissions ? user.permissions : user.getGlobalPermissions()
// System Admin
if (_.includes(user.permissions, 'manage:system')) {
if (_.includes(userPermissions, 'manage:system')) {
return true
}
const userPermissions = user.permissions ? user.permissions : user.getGlobalPermissions()
// Check Global Permissions
if (_.intersection(userPermissions, permissions).length < 1) {
return false
}
console.info('---------------------')
// Check Page Rules
if (path && user.groups) {
let checkState = {
@@ -204,9 +203,6 @@ module.exports = {
})
})
console.info('DAKSJDHKASJD')
console.info(checkState)
return (checkState.match && !checkState.deny)
}