@budibase/backend-core 2.33.11 → 2.33.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/index.js +14 -7
  2. package/dist/index.js.map +2 -2
  3. package/dist/index.js.meta.json +1 -1
  4. package/dist/package.json +4 -4
  5. package/dist/src/security/roles.js +10 -9
  6. package/dist/src/security/roles.js.map +1 -1
  7. package/package.json +4 -4
  8. package/src/security/roles.ts +20 -11
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@budibase/backend-core",
3
- "version": "2.33.11",
3
+ "version": "2.33.13",
4
4
  "description": "Budibase backend core libraries used in server and worker",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
23
23
  "dependencies": {
24
24
  "@budibase/nano": "10.1.5",
25
25
  "@budibase/pouchdb-replication-stream": "1.2.11",
26
- "@budibase/shared-core": "2.33.11",
27
- "@budibase/types": "2.33.11",
26
+ "@budibase/shared-core": "2.33.13",
27
+ "@budibase/types": "2.33.13",
28
28
  "aws-cloudfront-sign": "3.0.2",
29
29
  "aws-sdk": "2.1030.0",
30
30
  "bcrypt": "5.1.0",
@@ -95,5 +95,5 @@
95
95
  }
96
96
  }
97
97
  },
98
- "gitHead": "1a4b76f9d12ee30d6317560066655a800651f052"
98
+ "gitHead": "ed7f4dc5c5d683fa08ba76c60d8304666e09bbfd"
99
99
  }
package/dist/src/security/roles.js CHANGED
@@ -185,7 +185,8 @@ function getBuiltinRole(roleId) {
185
185
  function builtinRoleToNumber(id) {
186
186
  const builtins = getBuiltinRoles();
187
187
  const MAX = Object.values(builtins).length + 1;
188
- if (id === BUILTIN_IDS.ADMIN || id === BUILTIN_IDS.BUILDER) {
188
+ if (compareRoleIds(id, BUILTIN_IDS.ADMIN) ||
189
+ compareRoleIds(id, BUILTIN_IDS.BUILDER)) {
189
190
  return MAX;
190
191
  }
191
192
  let role = builtins[id], count = 0;
@@ -222,7 +223,7 @@ function roleToNumber(id) {
222
223
  // find the built-in roles, get their number, sort it, then get the last one
223
224
  const highestBuiltin = role.inherits
224
225
  .map(roleId => {
225
- const foundRole = hierarchy.find(role => role._id === roleId);
226
+ const foundRole = hierarchy.find(role => compareRoleIds(role._id, roleId));
226
227
  if (foundRole) {
227
228
  return findNumber(foundRole) + 1;
228
229
  }
@@ -325,7 +326,7 @@ function getAllUserRoles(userRoleId, opts) {
325
326
  return __awaiter(this, void 0, void 0, function* () {
326
327
  const allRoles = yield getAllRoles();
327
328
  // admins have access to all roles
328
- if (userRoleId === BUILTIN_IDS.ADMIN) {
329
+ if (compareRoleIds(userRoleId, BUILTIN_IDS.ADMIN)) {
329
330
  return allRoles;
330
331
  }
331
332
  // get all the inherited roles
@@ -427,15 +428,15 @@ function getAllRoles(appId) {
427
428
  // need to combine builtin with any DB record of them (for sake of permissions)
428
429
  for (let builtinRoleId of externalBuiltinRoles) {
429
430
  const builtinRole = builtinRoles[builtinRoleId];
430
- const dbBuiltin = roles.filter(dbRole => getExternalRoleID(dbRole._id, dbRole.version) === builtinRoleId)[0];
431
+ const dbBuiltin = roles.filter(dbRole => compareRoleIds(dbRole._id, builtinRoleId))[0];
431
432
  if (dbBuiltin == null) {
432
433
  roles.push(builtinRole || builtinRoles.BASIC);
433
434
  }
434
435
  else {
435
436
  // remove role and all back after combining with the builtin
436
437
  roles = roles.filter(role => role._id !== dbBuiltin._id);
437
- dbBuiltin._id = getExternalRoleID(dbBuiltin._id, dbBuiltin.version);
438
- roles.push(Object.assign(builtinRole, dbBuiltin));
438
+ dbBuiltin._id = getExternalRoleID(builtinRole._id, dbBuiltin.version);
439
+ roles.push(Object.assign(Object.assign(Object.assign({}, builtinRole), dbBuiltin), { name: builtinRole.name, _id: getExternalRoleID(builtinRole._id, builtinRole.version) }));
439
440
  }
440
441
  }
441
442
  // check permissions
@@ -474,9 +475,9 @@ class AccessController {
474
475
  // is currently in the builder
475
476
  if (tryingRoleId == null ||
476
477
  tryingRoleId === "" ||
477
- tryingRoleId === userRoleId ||
478
- tryingRoleId === BUILTIN_IDS.BUILDER ||
479
- userRoleId === BUILTIN_IDS.BUILDER) {
478
+ compareRoleIds(tryingRoleId, BUILTIN_IDS.BUILDER) ||
479
+ compareRoleIds(userRoleId, tryingRoleId) ||
480
+ compareRoleIds(userRoleId, BUILTIN_IDS.BUILDER)) {
480
481
  return true;
481
482
  }
482
483
  let roleIds = userRoleId ? this.userHierarchies[userRoleId] : null;
package/dist/src/security/roles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@budibase/backend-core",
3
- "version": "2.33.11",
3
+ "version": "2.33.13",
4
4
  "description": "Budibase backend core libraries used in server and worker",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
23
23
  "dependencies": {
24
24
  "@budibase/nano": "10.1.5",
25
25
  "@budibase/pouchdb-replication-stream": "1.2.11",
26
- "@budibase/shared-core": "2.33.11",
27
- "@budibase/types": "2.33.11",
26
+ "@budibase/shared-core": "2.33.13",
27
+ "@budibase/types": "2.33.13",
28
28
  "aws-cloudfront-sign": "3.0.2",
29
29
  "aws-sdk": "2.1030.0",
30
30
  "bcrypt": "5.1.0",
@@ -95,5 +95,5 @@
95
95
  }
96
96
  }
97
97
  },
98
- "gitHead": "1a4b76f9d12ee30d6317560066655a800651f052"
98
+ "gitHead": "ed7f4dc5c5d683fa08ba76c60d8304666e09bbfd"
99
99
  }
package/src/security/roles.ts CHANGED
@@ -219,7 +219,10 @@ export function getBuiltinRole(roleId: string): Role | undefined {
219
219
  export function builtinRoleToNumber(id: string) {
220
220
  const builtins = getBuiltinRoles()
221
221
  const MAX = Object.values(builtins).length + 1
222
- if (id === BUILTIN_IDS.ADMIN || id === BUILTIN_IDS.BUILDER) {
222
+ if (
223
+ compareRoleIds(id, BUILTIN_IDS.ADMIN) ||
224
+ compareRoleIds(id, BUILTIN_IDS.BUILDER)
225
+ ) {
223
226
  return MAX
224
227
  }
225
228
  let role = builtins[id],
@@ -256,7 +259,9 @@ export async function roleToNumber(id: string) {
256
259
  // find the built-in roles, get their number, sort it, then get the last one
257
260
  const highestBuiltin: number | undefined = role.inherits
258
261
  .map(roleId => {
259
- const foundRole = hierarchy.find(role => role._id === roleId)
262
+ const foundRole = hierarchy.find(role =>
263
+ compareRoleIds(role._id!, roleId)
264
+ )
260
265
  if (foundRole) {
261
266
  return findNumber(foundRole) + 1
262
267
  }
@@ -380,7 +385,7 @@ async function getAllUserRoles(
380
385
  ): Promise<RoleDoc[]> {
381
386
  const allRoles = await getAllRoles()
382
387
  // admins have access to all roles
383
- if (userRoleId === BUILTIN_IDS.ADMIN) {
388
+ if (compareRoleIds(userRoleId, BUILTIN_IDS.ADMIN)) {
384
389
  return allRoles
385
390
  }
386
391
 
@@ -491,17 +496,21 @@ export async function getAllRoles(appId?: string): Promise<RoleDoc[]> {
491
496
  // need to combine builtin with any DB record of them (for sake of permissions)
492
497
  for (let builtinRoleId of externalBuiltinRoles) {
493
498
  const builtinRole = builtinRoles[builtinRoleId]
494
- const dbBuiltin = roles.filter(
495
- dbRole =>
496
- getExternalRoleID(dbRole._id!, dbRole.version) === builtinRoleId
499
+ const dbBuiltin = roles.filter(dbRole =>
500
+ compareRoleIds(dbRole._id!, builtinRoleId)
497
501
  )[0]
498
502
  if (dbBuiltin == null) {
499
503
  roles.push(builtinRole || builtinRoles.BASIC)
500
504
  } else {
501
505
  // remove role and all back after combining with the builtin
502
506
  roles = roles.filter(role => role._id !== dbBuiltin._id)
503
- dbBuiltin._id = getExternalRoleID(dbBuiltin._id!, dbBuiltin.version)
504
- roles.push(Object.assign(builtinRole, dbBuiltin))
507
+ dbBuiltin._id = getExternalRoleID(builtinRole._id!, dbBuiltin.version)
508
+ roles.push({
509
+ ...builtinRole,
510
+ ...dbBuiltin,
511
+ name: builtinRole.name,
512
+ _id: getExternalRoleID(builtinRole._id!, builtinRole.version),
513
+ })
505
514
  }
506
515
  }
507
516
  // check permissions
@@ -544,9 +553,9 @@ export class AccessController {
544
553
  if (
545
554
  tryingRoleId == null ||
546
555
  tryingRoleId === "" ||
547
- tryingRoleId === userRoleId ||
548
- tryingRoleId === BUILTIN_IDS.BUILDER ||
549
- userRoleId === BUILTIN_IDS.BUILDER
556
+ compareRoleIds(tryingRoleId, BUILTIN_IDS.BUILDER) ||
557
+ compareRoleIds(userRoleId!, tryingRoleId) ||
558
+ compareRoleIds(userRoleId!, BUILTIN_IDS.BUILDER)
550
559
  ) {
551
560
  return true
552
561
  }