Browse Source

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

Ensure auth access for builder and admins
master
Peter Clement 4 years ago
committed by GitHub
parent
commit
d9e45a1bab
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      packages/builder/src/pages/builder/apps/index.svelte

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

@ -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)
)
} }
} }

Loading…
Cancel
Save