@budibase/backend-core 2.7.34-alpha.9 → 2.7.36-alpha.1
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.
- package/dist/package.json +3 -3
- package/dist/src/configs/configs.d.ts +2 -1
- package/dist/src/configs/configs.js +7 -1
- package/dist/src/configs/configs.js.map +1 -1
- package/dist/src/db/Replication.js +3 -0
- package/dist/src/db/Replication.js.map +1 -1
- package/dist/src/docIds/ids.d.ts +5 -1
- package/dist/src/docIds/ids.js +14 -3
- package/dist/src/docIds/ids.js.map +1 -1
- package/dist/src/security/roles.d.ts +7 -2
- package/dist/src/security/roles.js +24 -10
- package/dist/src/security/roles.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/configs/configs.ts +5 -0
- package/src/db/Replication.ts +3 -0
- package/src/docIds/ids.ts +13 -2
- package/src/security/roles.ts +30 -10
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.36-alpha.1",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@budibase/nano": "10.1.2",
|
|
24
24
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
25
|
-
"@budibase/types": "2.7.
|
|
25
|
+
"@budibase/types": "2.7.36-alpha.1",
|
|
26
26
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
27
27
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
28
28
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "8d3bbb718b4e3dea5e1da2dfa30fac231ef4fe22"
|
|
105
105
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Config, ConfigType, GoogleInnerConfig, OIDCInnerConfig, SCIMInnerConfig, SettingsConfig, SettingsInnerConfig, SMTPConfig, SMTPInnerConfig } from "@budibase/types";
|
|
1
|
+
import { Config, ConfigType, GoogleInnerConfig, OIDCInnerConfig, OIDCLogosConfig, SCIMInnerConfig, SettingsConfig, SettingsInnerConfig, SMTPConfig, SMTPInnerConfig } from "@budibase/types";
|
|
2
2
|
/**
|
|
3
3
|
* Generates a new configuration ID.
|
|
4
4
|
* @returns {string} The new configuration ID which the config doc can be stored under.
|
|
@@ -21,6 +21,7 @@ export declare const analyticsEnabled: (opts?: {
|
|
|
21
21
|
export declare function getGoogleConfig(): Promise<GoogleInnerConfig | undefined>;
|
|
22
22
|
export declare function getGoogleDatasourceConfig(): Promise<GoogleInnerConfig | undefined>;
|
|
23
23
|
export declare function getDefaultGoogleConfig(): GoogleInnerConfig | undefined;
|
|
24
|
+
export declare function getOIDCLogosDoc(): Promise<OIDCLogosConfig | undefined>;
|
|
24
25
|
export declare function getOIDCConfig(): Promise<OIDCInnerConfig | undefined>;
|
|
25
26
|
/**
|
|
26
27
|
* @param configId The config id of the inner config to retrieve
|
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.getSCIMConfig = exports.getSMTPConfig = exports.getSMTPConfigDoc = exports.getOIDCConfigById = exports.getOIDCConfig = exports.getDefaultGoogleConfig = exports.getGoogleDatasourceConfig = exports.getGoogleConfig = exports.analyticsEnabled = exports.getPlatformUrl = exports.getSettingsConfig = exports.getSettingsConfigDoc = exports.save = exports.getConfig = exports.generateConfigID = void 0;
|
|
38
|
+
exports.getSCIMConfig = exports.getSMTPConfig = exports.getSMTPConfigDoc = exports.getOIDCConfigById = exports.getOIDCConfig = exports.getOIDCLogosDoc = exports.getDefaultGoogleConfig = exports.getGoogleDatasourceConfig = exports.getGoogleConfig = exports.analyticsEnabled = exports.getPlatformUrl = exports.getSettingsConfig = exports.getSettingsConfigDoc = exports.save = exports.getConfig = exports.generateConfigID = void 0;
|
|
39
39
|
const types_1 = require("@budibase/types");
|
|
40
40
|
const constants_1 = require("../constants");
|
|
41
41
|
const cache_1 = require("../cache");
|
|
@@ -204,6 +204,12 @@ function getDefaultGoogleConfig() {
|
|
|
204
204
|
}
|
|
205
205
|
exports.getDefaultGoogleConfig = getDefaultGoogleConfig;
|
|
206
206
|
// OIDC
|
|
207
|
+
function getOIDCLogosDoc() {
|
|
208
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
209
|
+
return getConfig(types_1.ConfigType.OIDC_LOGOS);
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
exports.getOIDCLogosDoc = getOIDCLogosDoc;
|
|
207
213
|
function getOIDCConfigDoc() {
|
|
208
214
|
return __awaiter(this, void 0, void 0, function* () {
|
|
209
215
|
return getConfig(types_1.ConfigType.OIDC);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/configs/configs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/configs/configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Replication.js","sourceRoot":"","sources":["../../../src/db/Replication.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkD;AAClD,4CAA2C;AAE3C,MAAM,WAAW;IAKf;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,MAAM,EAAO;QACjC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,KAAK;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,SAAS,CAAC,SAAc,EAAE,IAAI,GAAG,EAAE;QACjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;iBACzB,EAAE,CAAC,QAAQ,EAAE,UAAU,GAAQ;gBAC9B,2DAA2D;gBAC3D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;YAChE,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,UAAU,IAAS;gBACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,UAAU,GAAQ;gBAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAI,GAAG,EAAE;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,IAAI,GAAG,EAAE;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE;gBACnB,OAAO,GAAG,CAAC,GAAG,KAAK,wBAAY,CAAC,YAAY,CAAA;YAC9C,CAAC;SACF,CAAA;IACH,CAAC;IAED;;OAEG;IACG,QAAQ;;YACZ,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;YAC3B,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1C,oDAAoD;YACpD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
|
|
1
|
+
{"version":3,"file":"Replication.js","sourceRoot":"","sources":["../../../src/db/Replication.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkD;AAClD,4CAA2C;AAE3C,MAAM,WAAW;IAKf;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,MAAM,EAAO;QACjC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,KAAK;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,SAAS,CAAC,SAAc,EAAE,IAAI,GAAG,EAAE;QACjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;iBACzB,EAAE,CAAC,QAAQ,EAAE,UAAU,GAAQ;gBAC9B,2DAA2D;gBAC3D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;YAChE,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,UAAU,IAAS;gBACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,UAAU,GAAQ;gBAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAI,GAAG,EAAE;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,IAAI,GAAG,EAAE;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE;gBACnB,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,wBAAY,CAAC,cAAc,CAAC,EAAE;oBAC9D,OAAO,KAAK,CAAA;iBACb;gBACD,OAAO,GAAG,CAAC,GAAG,KAAK,wBAAY,CAAC,YAAY,CAAA;YAC9C,CAAC;SACF,CAAA;IACH,CAAC;IAED;;OAEG;IACG,QAAQ;;YACZ,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;YAC3B,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1C,oDAAoD;YACpD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
|
package/dist/src/docIds/ids.d.ts
CHANGED
|
@@ -40,7 +40,11 @@ export declare function generateAppUserID(prodAppId: string, userId: string): st
|
|
|
40
40
|
* Generates a new role ID.
|
|
41
41
|
* @returns {string} The new role ID which the role doc can be stored under.
|
|
42
42
|
*/
|
|
43
|
-
export declare function generateRoleID(
|
|
43
|
+
export declare function generateRoleID(name: string): string;
|
|
44
|
+
/**
|
|
45
|
+
* Utility function to be more verbose.
|
|
46
|
+
*/
|
|
47
|
+
export declare function prefixRoleID(name: string): string;
|
|
44
48
|
/**
|
|
45
49
|
* Generates a new dev info document ID - this is scoped to a user.
|
|
46
50
|
* @returns {string} The new dev info ID which info for dev (like api key) can be stored under.
|
package/dist/src/docIds/ids.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generatePluginID = exports.generateDevInfoID = exports.generateRoleID = exports.generateAppUserID = exports.generateTemplateID = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.generateGlobalUserID = exports.generateWorkspaceID = exports.generateRowID = exports.generateAppID = void 0;
|
|
3
|
+
exports.generatePluginID = exports.generateDevInfoID = exports.prefixRoleID = exports.generateRoleID = exports.generateAppUserID = exports.generateTemplateID = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.generateGlobalUserID = exports.generateWorkspaceID = exports.generateRowID = exports.generateAppID = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const newid_1 = require("./newid");
|
|
6
6
|
/**
|
|
@@ -78,10 +78,21 @@ exports.generateAppUserID = generateAppUserID;
|
|
|
78
78
|
* Generates a new role ID.
|
|
79
79
|
* @returns {string} The new role ID which the role doc can be stored under.
|
|
80
80
|
*/
|
|
81
|
-
function generateRoleID(
|
|
82
|
-
|
|
81
|
+
function generateRoleID(name) {
|
|
82
|
+
const prefix = `${constants_1.DocumentType.ROLE}${constants_1.SEPARATOR}`;
|
|
83
|
+
if (name.startsWith(prefix)) {
|
|
84
|
+
return name;
|
|
85
|
+
}
|
|
86
|
+
return `${prefix}${name}`;
|
|
83
87
|
}
|
|
84
88
|
exports.generateRoleID = generateRoleID;
|
|
89
|
+
/**
|
|
90
|
+
* Utility function to be more verbose.
|
|
91
|
+
*/
|
|
92
|
+
function prefixRoleID(name) {
|
|
93
|
+
return generateRoleID(name);
|
|
94
|
+
}
|
|
95
|
+
exports.prefixRoleID = prefixRoleID;
|
|
85
96
|
/**
|
|
86
97
|
* Generates a new dev info document ID - this is scoped to a user.
|
|
87
98
|
* @returns {string} The new dev info ID which info for dev (like api key) can be stored under.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":";;;AAAA,4CAKqB;AACrB,mCAA+B;AAE/B;;;GAGG;AACI,MAAM,aAAa,GAAG,CAAC,QAAwB,EAAE,EAAE;IACxD,IAAI,EAAE,GAAG,sBAAU,CAAA;IACnB,IAAI,QAAQ,EAAE;QACZ,EAAE,IAAI,GAAG,QAAQ,GAAG,qBAAS,EAAE,CAAA;KAChC;IACD,OAAO,GAAG,EAAE,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC1B,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAED;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,OAAe,EAAE,EAAW;IACxD,EAAE,GAAG,EAAE,IAAI,IAAA,aAAK,GAAE,CAAA;IAClB,OAAO,GAAG,wBAAY,CAAC,GAAG,GAAG,qBAAS,GAAG,OAAO,GAAG,qBAAS,GAAG,EAAE,EAAE,CAAA;AACrE,CAAC;AAHD,sCAGC;AAED;;;GAGG;AACH,SAAgB,mBAAmB;IACjC,OAAO,GAAG,wBAAY,CAAC,SAAS,GAAG,qBAAS,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC1D,CAAC;AAFD,kDAEC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,EAAQ;IAC3C,OAAO,GAAG,wBAAY,CAAC,IAAI,GAAG,qBAAS,GAAG,EAAE,IAAI,IAAA,aAAK,GAAE,EAAE,CAAA;AAC3D,CAAC;AAFD,oDAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,aAAa,CAAC,yBAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;AAC7D,CAAC;AAFD,wDAEC;AAED;;GAEG;AACH,SAAgB,6BAA6B,CAAC,EAAU;IACtD,MAAM,MAAM,GAAG,GAAG,wBAAY,CAAC,GAAG,GAAG,qBAAS,GAAG,yBAAa,CAAC,aAAa,GAAG,qBAAS,EAAE,CAAA;IAC1F,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,EAAE,CAAA;KACV;IACD,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAC5B,CAAC;AAND,sEAMC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,OAAY;IAC7C,OAAO,GAAG,wBAAY,CAAC,QAAQ,GAAG,qBAAS,GAAG,OAAO,GAAG,qBAAS,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC/E,CAAC;AAFD,gDAEC;AAED,SAAgB,iBAAiB,CAAC,SAAiB,EAAE,MAAc;IACjE,OAAO,GAAG,SAAS,GAAG,qBAAS,GAAG,MAAM,EAAE,CAAA;AAC5C,CAAC;AAFD,8CAEC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,17 @@ export declare const BUILTIN_ROLE_IDS: {
|
|
|
5
5
|
BASIC: string;
|
|
6
6
|
PUBLIC: string;
|
|
7
7
|
};
|
|
8
|
+
export declare const RoleIDVersion: {
|
|
9
|
+
UUID: undefined;
|
|
10
|
+
NAME: string;
|
|
11
|
+
};
|
|
8
12
|
export declare class Role implements RoleDoc {
|
|
9
13
|
_id: string;
|
|
10
14
|
_rev?: string;
|
|
11
15
|
name: string;
|
|
12
16
|
permissionId: string;
|
|
13
17
|
inherits?: string;
|
|
18
|
+
version?: string;
|
|
14
19
|
permissions: {};
|
|
15
20
|
constructor(id: string, name: string, permissionId: string);
|
|
16
21
|
addInheritance(inherits: string): this;
|
|
@@ -87,8 +92,8 @@ export declare class AccessController {
|
|
|
87
92
|
/**
|
|
88
93
|
* Adds the "role_" for builtin role IDs which are to be written to the DB (for permissions).
|
|
89
94
|
*/
|
|
90
|
-
export declare function getDBRoleID(
|
|
95
|
+
export declare function getDBRoleID(roleName: string): string;
|
|
91
96
|
/**
|
|
92
97
|
* Remove the "role_" from builtin role IDs that have been written to the DB (for permissions).
|
|
93
98
|
*/
|
|
94
|
-
export declare function getExternalRoleID(roleId?: string): string
|
|
99
|
+
export declare function getExternalRoleID(roleId: string, version?: string): string;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getRequiredResourceRole = exports.getAllRoles = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.isBuiltin = exports.BUILTIN_ROLE_NAME_ARRAY = exports.BUILTIN_ROLE_ID_ARRAY = exports.getBuiltinRoles = exports.Role = exports.BUILTIN_ROLE_IDS = void 0;
|
|
12
|
+
exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getRequiredResourceRole = exports.getAllRoles = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.isBuiltin = exports.BUILTIN_ROLE_NAME_ARRAY = exports.BUILTIN_ROLE_ID_ARRAY = exports.getBuiltinRoles = exports.Role = exports.RoleIDVersion = exports.BUILTIN_ROLE_IDS = void 0;
|
|
13
13
|
const permissions_1 = require("./permissions");
|
|
14
14
|
const db_1 = require("../db");
|
|
15
15
|
const context_1 = require("../context");
|
|
@@ -29,12 +29,20 @@ const EXTERNAL_BUILTIN_ROLE_IDS = [
|
|
|
29
29
|
BUILTIN_IDS.BASIC,
|
|
30
30
|
BUILTIN_IDS.PUBLIC,
|
|
31
31
|
];
|
|
32
|
+
exports.RoleIDVersion = {
|
|
33
|
+
// original version, with a UUID based ID
|
|
34
|
+
UUID: undefined,
|
|
35
|
+
// new version - with name based ID
|
|
36
|
+
NAME: "name",
|
|
37
|
+
};
|
|
32
38
|
class Role {
|
|
33
39
|
constructor(id, name, permissionId) {
|
|
34
40
|
this.permissions = {};
|
|
35
41
|
this._id = id;
|
|
36
42
|
this.name = name;
|
|
37
43
|
this.permissionId = permissionId;
|
|
44
|
+
// version for managing the ID - removing the role_ when responding
|
|
45
|
+
this.version = exports.RoleIDVersion.NAME;
|
|
38
46
|
}
|
|
39
47
|
addInheritance(inherits) {
|
|
40
48
|
this.inherits = inherits;
|
|
@@ -133,12 +141,16 @@ function getRole(roleId, opts) {
|
|
|
133
141
|
if (isBuiltin(roleId)) {
|
|
134
142
|
role = cloneDeep(Object.values(BUILTIN_ROLES).find(role => role._id === roleId));
|
|
135
143
|
}
|
|
144
|
+
else {
|
|
145
|
+
// make sure has the prefix (if it has it then it won't be added)
|
|
146
|
+
roleId = (0, db_1.prefixRoleID)(roleId);
|
|
147
|
+
}
|
|
136
148
|
try {
|
|
137
149
|
const db = (0, context_1.getAppDB)();
|
|
138
150
|
const dbRole = yield db.get(getDBRoleID(roleId));
|
|
139
151
|
role = Object.assign(role, dbRole);
|
|
140
152
|
// finalise the ID
|
|
141
|
-
role._id = getExternalRoleID(role._id);
|
|
153
|
+
role._id = getExternalRoleID(role._id, role.version);
|
|
142
154
|
}
|
|
143
155
|
catch (err) {
|
|
144
156
|
if (!isBuiltin(roleId) && (opts === null || opts === void 0 ? void 0 : opts.defaultPublic)) {
|
|
@@ -235,19 +247,20 @@ function getAllRoles(appId) {
|
|
|
235
247
|
include_docs: true,
|
|
236
248
|
}));
|
|
237
249
|
roles = body.rows.map((row) => row.doc);
|
|
250
|
+
roles.forEach(role => (role._id = getExternalRoleID(role._id, role.version)));
|
|
238
251
|
}
|
|
239
252
|
const builtinRoles = getBuiltinRoles();
|
|
240
253
|
// need to combine builtin with any DB record of them (for sake of permissions)
|
|
241
254
|
for (let builtinRoleId of EXTERNAL_BUILTIN_ROLE_IDS) {
|
|
242
255
|
const builtinRole = builtinRoles[builtinRoleId];
|
|
243
|
-
const dbBuiltin = roles.filter(dbRole => getExternalRoleID(dbRole._id) === builtinRoleId)[0];
|
|
256
|
+
const dbBuiltin = roles.filter(dbRole => getExternalRoleID(dbRole._id, dbRole.version) === builtinRoleId)[0];
|
|
244
257
|
if (dbBuiltin == null) {
|
|
245
258
|
roles.push(builtinRole || builtinRoles.BASIC);
|
|
246
259
|
}
|
|
247
260
|
else {
|
|
248
261
|
// remove role and all back after combining with the builtin
|
|
249
262
|
roles = roles.filter(role => role._id !== dbBuiltin._id);
|
|
250
|
-
dbBuiltin._id = getExternalRoleID(dbBuiltin._id);
|
|
263
|
+
dbBuiltin._id = getExternalRoleID(dbBuiltin._id, dbBuiltin.version);
|
|
251
264
|
roles.push(Object.assign(builtinRole, dbBuiltin));
|
|
252
265
|
}
|
|
253
266
|
}
|
|
@@ -350,19 +363,20 @@ exports.AccessController = AccessController;
|
|
|
350
363
|
/**
|
|
351
364
|
* Adds the "role_" for builtin role IDs which are to be written to the DB (for permissions).
|
|
352
365
|
*/
|
|
353
|
-
function getDBRoleID(
|
|
354
|
-
if (
|
|
355
|
-
return
|
|
366
|
+
function getDBRoleID(roleName) {
|
|
367
|
+
if (roleName === null || roleName === void 0 ? void 0 : roleName.startsWith(db_1.DocumentType.ROLE)) {
|
|
368
|
+
return roleName;
|
|
356
369
|
}
|
|
357
|
-
return (0, db_1.
|
|
370
|
+
return (0, db_1.prefixRoleID)(roleName);
|
|
358
371
|
}
|
|
359
372
|
exports.getDBRoleID = getDBRoleID;
|
|
360
373
|
/**
|
|
361
374
|
* Remove the "role_" from builtin role IDs that have been written to the DB (for permissions).
|
|
362
375
|
*/
|
|
363
|
-
function getExternalRoleID(roleId) {
|
|
376
|
+
function getExternalRoleID(roleId, version) {
|
|
364
377
|
// for built-in roles we want to remove the DB role ID element (role_)
|
|
365
|
-
if ((roleId
|
|
378
|
+
if ((roleId.startsWith(db_1.DocumentType.ROLE) && isBuiltin(roleId)) ||
|
|
379
|
+
version === exports.RoleIDVersion.NAME) {
|
|
366
380
|
return roleId.split(`${db_1.DocumentType.ROLE}${db_1.SEPARATOR}`)[1];
|
|
367
381
|
}
|
|
368
382
|
return roleId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":"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"}
|