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

Merge branch 'dev-experience' of github.com:Budibase/budibase into dev-experience

This commit is contained in:
Andrew Kingston 2021-04-07 11:31:26 +01:00
parent 99258da2df 486ca97330
commit 3f51c07177
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/api/routes/tests/component.spec.js
View File

@ -14,7 +14,7 @@ describe("/component", () => {
describe("fetch definitions", () => { describe("fetch definitions", () => {
it("should be able to fetch definitions", async () => { it("should be able to fetch definitions", async () => {
const res = await request const res = await request
.get(`/${config.getAppId()}/components/definitions`) .get(`/api/${config.getAppId()}/components/definitions`)
.set(config.defaultHeaders()) .set(config.defaultHeaders())
.expect("Content-Type", /json/) .expect("Content-Type", /json/)
.expect(200) .expect(200)
@ -25,7 +25,7 @@ describe("/component", () => {
await checkBuilderEndpoint({ await checkBuilderEndpoint({
config, config,
method: "GET", method: "GET",
url: `/${config.getAppId()}/components/definitions`, url: `/api/${config.getAppId()}/components/definitions`,
}) })
}) })
}) })

4
packages/server/src/middleware/authorized.js
View File

@ -42,10 +42,6 @@ module.exports = (permType, permLevel = null) => async (ctx, next) => {
const isAdmin = ADMIN_ROLES.includes(role._id) const isAdmin = ADMIN_ROLES.includes(role._id)
const isAuthed = ctx.auth.authenticated const isAuthed = ctx.auth.authenticated
if (permType === PermissionTypes.BUILDER) {
return next()
}
const { basePermissions, permissions } = await getUserPermissions( const { basePermissions, permissions } = await getUserPermissions(
ctx.appId, ctx.appId,
role._id role._id