OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix allow logic

Browse Source
This commit is contained in:
Aaron Dalton 2023-11-07 08:32:36 -05:00
parent 31feed17d8
commit ec064c5917
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/auth/auth-helpers.js
View File

@ -31,13 +31,14 @@ function filterAllowedItems({user, groups}, itemGroups, groupKey) {
return itemGroups.map((group) => ({ return itemGroups.map((group) => ({
name: group.name, name: group.name,
[groupKey]: group[groupKey].filter((item) => authItemFilter({user, groups}, item)) [groupKey]: group[groupKey].filter((item) => authItemFilter({user, groups}, item))
})).filter((group) => !group[groupKey].length); })).filter((group) => group[groupKey].length);
} }
function authItemFilter({user, groups}, item) { function authItemFilter({user, groups}, item) {
const groupAllow = (!('allowGroups' in item)) || groups.some(group => item.allowGroups.includes(group)); const groupAllow = (('allowGroups' in item)) && groups.some(group => item.allowGroups.includes(group));
const userAllow = (!('allowUsers' in item)) || item.allowUsers.includes(user); const userAllow = (('allowUsers' in item)) && item.allowUsers.includes(user);
const allowAll = (!('allowGroups' in item)) && (!('allowUsers' in item));
return userAllow || groupAllow; return userAllow || groupAllow || allowAll;
} }