MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7013 from Budibase/fix/fix-access-issue 

Ensure auth access for builder and admins
This commit is contained in:
Peter Clement 2022-08-01 09:08:41 +01:00 committed by GitHub
parent 07979bba8e a497aa8b8e
commit 9d931d4469
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/builder/src/pages/builder/apps/index.svelte
View File

@ -46,23 +46,25 @@
$: { $: {
if (!Object.keys($auth.user?.roles).length && $auth.user?.userGroups) { if (!Object.keys($auth.user?.roles).length && $auth.user?.userGroups) {
userApps = $auth.user?.builder?.global userApps =
? publishedApps $auth.user?.builder?.global || $auth.user?.admin?.global
: publishedApps.filter(app => { ? publishedApps
return userGroups.find(group => { : publishedApps.filter(app => {
return Object.keys(group.roles) return userGroups.find(group => {
.map(role => apps.extractAppId(role)) return Object.keys(group.roles)
.includes(app.appId) .map(role => apps.extractAppId(role))
.includes(app.appId)
})
}) })
})
} else { } else {
userApps = $auth.user?.builder?.global userApps =
? publishedApps $auth.user?.builder?.global || $auth.user?.admin?.global
: publishedApps.filter(app => ? publishedApps
Object.keys($auth.user?.roles) : publishedApps.filter(app =>
.map(x => apps.extractAppId(x)) Object.keys($auth.user?.roles)
.includes(app.appId) .map(x => apps.extractAppId(x))
) .includes(app.appId)
)
} }
} }