@budibase/backend-core 2.21.2 → 2.21.4
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/index.js +68 -57
- package/dist/index.js.map +3 -3
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +6 -5
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/cache/base/index.d.ts +1 -1
- package/dist/src/cache/generic.d.ts +1 -1
- package/dist/src/cache/user.js.map +1 -1
- package/dist/src/db/Replication.d.ts +13 -25
- package/dist/src/db/Replication.js +18 -33
- package/dist/src/db/Replication.js.map +1 -1
- package/dist/src/redis/redis.d.ts +9 -5
- package/dist/src/redis/redis.js +46 -3
- package/dist/src/redis/redis.js.map +1 -1
- package/dist/src/redis/redlockImpl.js.map +1 -1
- package/dist/src/security/roles.d.ts +9 -10
- package/dist/src/security/roles.js +15 -18
- package/dist/src/security/roles.js.map +1 -1
- package/dist/tests/core/utilities/structures/accounts.js +1 -1
- package/dist/tests/core/utilities/structures/accounts.js.map +1 -1
- package/dist/tests/core/utilities/structures/scim.js +1 -1
- package/dist/tests/core/utilities/structures/scim.js.map +1 -1
- package/package.json +6 -5
- package/src/cache/user.ts +2 -2
- package/src/db/Replication.ts +27 -40
- package/src/redis/redis.ts +58 -9
- package/src/redis/redlockImpl.ts +1 -1
- package/src/redis/tests/redis.spec.ts +214 -0
- package/src/security/roles.ts +27 -35
- package/tests/core/utilities/structures/accounts.ts +1 -1
- package/tests/core/utilities/structures/scim.ts +1 -1
package/dist/src/redis/redis.js
CHANGED
|
@@ -57,7 +57,7 @@ const CLUSTERED = environment_1.default.REDIS_CLUSTERED;
|
|
|
57
57
|
const DEFAULT_SELECT_DB = utils_1.SelectableDatabase.DEFAULT;
|
|
58
58
|
// for testing just generate the client once
|
|
59
59
|
let CLOSED = false;
|
|
60
|
-
|
|
60
|
+
const CLIENTS = {};
|
|
61
61
|
let CONNECTED = false;
|
|
62
62
|
// mock redis always connected
|
|
63
63
|
if (environment_1.default.MOCK_REDIS) {
|
|
@@ -224,7 +224,10 @@ class RedisWrapper {
|
|
|
224
224
|
stream = node[0].scanStream({ match: key + "*", count: 100 });
|
|
225
225
|
}
|
|
226
226
|
else {
|
|
227
|
-
stream = this.getClient().scanStream({
|
|
227
|
+
stream = this.getClient().scanStream({
|
|
228
|
+
match: key + "*",
|
|
229
|
+
count: 100,
|
|
230
|
+
});
|
|
228
231
|
}
|
|
229
232
|
return promisifyStream(stream, this.getClient());
|
|
230
233
|
});
|
|
@@ -244,9 +247,11 @@ class RedisWrapper {
|
|
|
244
247
|
get(key) {
|
|
245
248
|
return __awaiter(this, void 0, void 0, function* () {
|
|
246
249
|
const db = this._db;
|
|
247
|
-
|
|
250
|
+
const response = yield this.getClient().get((0, utils_1.addDbPrefix)(db, key));
|
|
248
251
|
// overwrite the prefixed key
|
|
252
|
+
// @ts-ignore
|
|
249
253
|
if (response != null && response.key) {
|
|
254
|
+
// @ts-ignore
|
|
250
255
|
response.key = key;
|
|
251
256
|
}
|
|
252
257
|
// if its not an object just return the response
|
|
@@ -302,6 +307,24 @@ class RedisWrapper {
|
|
|
302
307
|
}
|
|
303
308
|
});
|
|
304
309
|
}
|
|
310
|
+
bulkStore(data, expirySeconds = null) {
|
|
311
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
312
|
+
const client = this.getClient();
|
|
313
|
+
const dataToStore = Object.entries(data).reduce((acc, [key, value]) => {
|
|
314
|
+
acc[(0, utils_1.addDbPrefix)(this._db, key)] =
|
|
315
|
+
typeof value === "object" ? JSON.stringify(value) : value;
|
|
316
|
+
return acc;
|
|
317
|
+
}, {});
|
|
318
|
+
const pipeline = client.pipeline();
|
|
319
|
+
pipeline.mset(dataToStore);
|
|
320
|
+
if (expirySeconds !== null) {
|
|
321
|
+
for (const key of Object.keys(dataToStore)) {
|
|
322
|
+
pipeline.expire(key, expirySeconds);
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
yield pipeline.exec();
|
|
326
|
+
});
|
|
327
|
+
}
|
|
305
328
|
getTTL(key) {
|
|
306
329
|
return __awaiter(this, void 0, void 0, function* () {
|
|
307
330
|
const db = this._db;
|
|
@@ -328,6 +351,26 @@ class RedisWrapper {
|
|
|
328
351
|
yield Promise.all(items.map((obj) => this.delete(obj.key)));
|
|
329
352
|
});
|
|
330
353
|
}
|
|
354
|
+
increment(key) {
|
|
355
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
356
|
+
const result = yield this.getClient().incr((0, utils_1.addDbPrefix)(this._db, key));
|
|
357
|
+
if (isNaN(result)) {
|
|
358
|
+
throw new Error(`Redis ${key} does not contain a number`);
|
|
359
|
+
}
|
|
360
|
+
return result;
|
|
361
|
+
});
|
|
362
|
+
}
|
|
363
|
+
deleteIfValue(key, value) {
|
|
364
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
365
|
+
const client = this.getClient();
|
|
366
|
+
const luaScript = `
|
|
367
|
+
if redis.call('GET', KEYS[1]) == ARGV[1] then
|
|
368
|
+
redis.call('DEL', KEYS[1])
|
|
369
|
+
end
|
|
370
|
+
`;
|
|
371
|
+
yield client.eval(luaScript, 1, (0, utils_1.addDbPrefix)(this._db, key), value);
|
|
372
|
+
});
|
|
373
|
+
}
|
|
331
374
|
}
|
|
332
375
|
exports.default = RedisWrapper;
|
|
333
376
|
//# sourceMappingURL=redis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/redis/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/redis/redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redlockImpl.js","sourceRoot":"","sources":["../../../src/redis/redlockImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA6B;AAC7B,iCAAsC;AACtC,2CAAuD;AACvD,oDAAqC;AACrC,uDAA6C;AAC7C,oCAAmC;AAEnC,SAAe,SAAS,CACtB,IAAc,EACd,IAAsB;;QAEtB,IAAI,IAAI,KAAK,gBAAQ,CAAC,MAAM,EAAE;YAC5B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAA;SACxB;QAED,QAAQ,IAAI,EAAE;YACZ,KAAK,gBAAQ,CAAC,QAAQ,CAAC,CAAC;gBACtB,OAAO,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;aACpC;YACD,KAAK,gBAAQ,CAAC,SAAS,CAAC,CAAC;gBACvB,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;aACrC;YACD,KAAK,gBAAQ,CAAC,OAAO,CAAC,CAAC;gBACrB,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aACnC;YACD,KAAK,gBAAQ,CAAC,SAAS,CAAC,CAAC;gBACvB,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;aACrC;YACD,KAAK,gBAAQ,CAAC,WAAW,CAAC,CAAC;gBACzB,OAAO,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;aACvC;YACD,OAAO,CAAC,CAAC;gBACP,MAAM,mBAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;aAC9B;SACF;IACH,CAAC;CAAA;AAED,MAAM,OAAO,GAAmD;IAC9D,QAAQ,EAAE;QACR,0DAA0D;QAC1D,UAAU,EAAE,CAAC;KACd;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC;KACd;IACD,OAAO,EAAE;QACP,6CAA6C;QAC7C,sCAAsC;QACtC,WAAW,EAAE,IAAI;QAEjB,+CAA+C;QAC/C,qCAAqC;QACrC,UAAU,EAAE,EAAE;QAEd,kCAAkC;QAClC,UAAU,EAAE,GAAG;QAEf,+CAA+C;QAC/C,+CAA+C;QAC/C,+DAA+D;QAC/D,WAAW,EAAE,GAAG,EAAE,aAAa;KAChC;IACD,SAAS,EAAE;QACT,UAAU,EAAE,GAAG;KAChB;IACD,MAAM,EAAE,EAAE;IACV,WAAW,EAAE;QACX,UAAU,EAAE,CAAC,CAAC;KACf;CACF,CAAA;AAED,SAAsB,UAAU,CAAC,OAAwB,EAAE;;QACzD,MAAM,OAAO,mCAAQ,OAAO,CAAC,OAAO,GAAK,IAAI,CAAE,CAAA;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAa,GAAE,CAAA;QAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"redlockImpl.js","sourceRoot":"","sources":["../../../src/redis/redlockImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,17 +23,16 @@ export declare class Role implements RoleDoc {
|
|
|
23
23
|
export declare function getBuiltinRoles(): {
|
|
24
24
|
[key: string]: RoleDoc;
|
|
25
25
|
};
|
|
26
|
-
export declare
|
|
27
|
-
export declare
|
|
28
|
-
export declare function isBuiltin(role?: string): boolean;
|
|
26
|
+
export declare function isBuiltin(role: string): boolean;
|
|
27
|
+
export declare function getBuiltinRole(roleId: string): Role | undefined;
|
|
29
28
|
/**
|
|
30
29
|
* Works through the inheritance ranks to see how far up the builtin stack this ID is.
|
|
31
30
|
*/
|
|
32
|
-
export declare function builtinRoleToNumber(id
|
|
31
|
+
export declare function builtinRoleToNumber(id: string): number;
|
|
33
32
|
/**
|
|
34
33
|
* Converts any role to a number, but has to be async to get the roles from db.
|
|
35
34
|
*/
|
|
36
|
-
export declare function roleToNumber(id
|
|
35
|
+
export declare function roleToNumber(id: string): Promise<number>;
|
|
37
36
|
/**
|
|
38
37
|
* Returns whichever builtin roleID is lower.
|
|
39
38
|
*/
|
|
@@ -45,10 +44,10 @@ export declare function lowerBuiltinRoleID(roleId1?: string, roleId2?: string):
|
|
|
45
44
|
* @param opts options for the function, like whether to halt errors, instead return public.
|
|
46
45
|
* @returns The role object, which may contain an "inherits" property.
|
|
47
46
|
*/
|
|
48
|
-
export declare function getRole(roleId
|
|
47
|
+
export declare function getRole(roleId: string, opts?: {
|
|
49
48
|
defaultPublic?: boolean;
|
|
50
|
-
}): Promise<RoleDoc
|
|
51
|
-
export declare function getUserRoleIdHierarchy(userRoleId
|
|
49
|
+
}): Promise<RoleDoc>;
|
|
50
|
+
export declare function getUserRoleIdHierarchy(userRoleId: string): Promise<string[]>;
|
|
52
51
|
/**
|
|
53
52
|
* Returns an ordered array of the user's inherited role IDs, this can be used
|
|
54
53
|
* to determine if a user can access something that requires a specific role.
|
|
@@ -57,7 +56,7 @@ export declare function getUserRoleIdHierarchy(userRoleId?: string): Promise<str
|
|
|
57
56
|
* @returns returns an ordered array of the roles, with the first being their
|
|
58
57
|
* highest level of access and the last being the lowest level.
|
|
59
58
|
*/
|
|
60
|
-
export declare function getUserRoleHierarchy(userRoleId
|
|
59
|
+
export declare function getUserRoleHierarchy(userRoleId: string, opts?: {
|
|
61
60
|
defaultPublic?: boolean;
|
|
62
61
|
}): Promise<RoleDoc[]>;
|
|
63
62
|
export declare function checkForRoleResourceArray(rolePerms: {
|
|
@@ -65,7 +64,7 @@ export declare function checkForRoleResourceArray(rolePerms: {
|
|
|
65
64
|
}, resourceId: string): {
|
|
66
65
|
[key: string]: string[];
|
|
67
66
|
};
|
|
68
|
-
export declare function getAllRoleIds(appId
|
|
67
|
+
export declare function getAllRoleIds(appId: string): Promise<string[]>;
|
|
69
68
|
/**
|
|
70
69
|
* Given an app ID this will retrieve all of the roles that are currently within that app.
|
|
71
70
|
* @return An array of the role objects that were found.
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getAllRoles = exports.getAllRoleIds = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getUserRoleIdHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.
|
|
15
|
+
exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getAllRoles = exports.getAllRoleIds = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getUserRoleIdHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.getBuiltinRole = exports.isBuiltin = exports.getBuiltinRoles = exports.Role = exports.RoleIDVersion = exports.BUILTIN_ROLE_IDS = void 0;
|
|
16
16
|
const permissions_1 = require("./permissions");
|
|
17
17
|
const db_1 = require("../db");
|
|
18
18
|
const context_1 = require("../context");
|
|
@@ -63,19 +63,22 @@ function getBuiltinRoles() {
|
|
|
63
63
|
return (0, cloneDeep_1.default)(BUILTIN_ROLES);
|
|
64
64
|
}
|
|
65
65
|
exports.getBuiltinRoles = getBuiltinRoles;
|
|
66
|
-
exports.BUILTIN_ROLE_ID_ARRAY = Object.values(BUILTIN_ROLES).map(role => role._id);
|
|
67
|
-
exports.BUILTIN_ROLE_NAME_ARRAY = Object.values(BUILTIN_ROLES).map(role => role.name);
|
|
68
66
|
function isBuiltin(role) {
|
|
69
|
-
return
|
|
67
|
+
return getBuiltinRole(role) !== undefined;
|
|
70
68
|
}
|
|
71
69
|
exports.isBuiltin = isBuiltin;
|
|
70
|
+
function getBuiltinRole(roleId) {
|
|
71
|
+
const role = Object.values(BUILTIN_ROLES).find(role => roleId.includes(role._id));
|
|
72
|
+
if (!role) {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
return (0, cloneDeep_1.default)(role);
|
|
76
|
+
}
|
|
77
|
+
exports.getBuiltinRole = getBuiltinRole;
|
|
72
78
|
/**
|
|
73
79
|
* Works through the inheritance ranks to see how far up the builtin stack this ID is.
|
|
74
80
|
*/
|
|
75
81
|
function builtinRoleToNumber(id) {
|
|
76
|
-
if (!id) {
|
|
77
|
-
return 0;
|
|
78
|
-
}
|
|
79
82
|
const builtins = getBuiltinRoles();
|
|
80
83
|
const MAX = Object.values(builtins).length + 1;
|
|
81
84
|
if (id === BUILTIN_IDS.ADMIN || id === BUILTIN_IDS.BUILDER) {
|
|
@@ -104,7 +107,7 @@ function roleToNumber(id) {
|
|
|
104
107
|
defaultPublic: true,
|
|
105
108
|
}));
|
|
106
109
|
for (let role of hierarchy) {
|
|
107
|
-
if (
|
|
110
|
+
if ((role === null || role === void 0 ? void 0 : role.inherits) && isBuiltin(role.inherits)) {
|
|
108
111
|
return builtinRoleToNumber(role.inherits) + 1;
|
|
109
112
|
}
|
|
110
113
|
}
|
|
@@ -136,23 +139,17 @@ exports.lowerBuiltinRoleID = lowerBuiltinRoleID;
|
|
|
136
139
|
*/
|
|
137
140
|
function getRole(roleId, opts) {
|
|
138
141
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
|
-
if (!roleId) {
|
|
140
|
-
return undefined;
|
|
141
|
-
}
|
|
142
|
-
let role = {};
|
|
143
142
|
// built in roles mostly come from the in-code implementation,
|
|
144
143
|
// but can be extended by a doc stored about them (e.g. permissions)
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
}
|
|
148
|
-
else {
|
|
144
|
+
let role = getBuiltinRole(roleId);
|
|
145
|
+
if (!role) {
|
|
149
146
|
// make sure has the prefix (if it has it then it won't be added)
|
|
150
147
|
roleId = (0, db_1.prefixRoleID)(roleId);
|
|
151
148
|
}
|
|
152
149
|
try {
|
|
153
150
|
const db = (0, context_1.getAppDB)();
|
|
154
151
|
const dbRole = yield db.get(getDBRoleID(roleId));
|
|
155
|
-
role = Object.assign(role, dbRole);
|
|
152
|
+
role = Object.assign(role || {}, dbRole);
|
|
156
153
|
// finalise the ID
|
|
157
154
|
role._id = getExternalRoleID(role._id, role.version);
|
|
158
155
|
}
|
|
@@ -161,7 +158,7 @@ function getRole(roleId, opts) {
|
|
|
161
158
|
return (0, cloneDeep_1.default)(BUILTIN_ROLES.PUBLIC);
|
|
162
159
|
}
|
|
163
160
|
// only throw an error if there is no role at all
|
|
164
|
-
if (Object.keys(role).length === 0) {
|
|
161
|
+
if (!role || Object.keys(role).length === 0) {
|
|
165
162
|
throw err;
|
|
166
163
|
}
|
|
167
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAoE;AACpE,8BAMc;AACd,wCAAqC;AAErC,oEAA2C;AAE9B,QAAA,gBAAgB,GAAG;IAC9B,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED,MAAM,WAAW,mCACZ,wBAAgB,KACnB,OAAO,EAAE,SAAS,GACnB,CAAA;AAED,sCAAsC;AACtC,MAAM,yBAAyB,GAAG;IAChC,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,MAAM;CACnB,CAAA;AAEY,QAAA,aAAa,GAAG;IAC3B,yCAAyC;IACzC,IAAI,EAAE,SAAS;IACf,mCAAmC;IACnC,IAAI,EAAE,MAAM;CACb,CAAA;AAED,MAAa,IAAI;IASf,YAAY,EAAU,EAAE,IAAY,EAAE,YAAoB;QAF1D,gBAAW,GAAG,EAAE,CAAA;QAGd,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,mEAAmE;QACnE,IAAI,CAAC,OAAO,GAAG,qBAAa,CAAC,IAAI,CAAA;IACnC,CAAC;IAED,cAAc,CAAC,QAAgB;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AArBD,oBAqBC;AAED,MAAM,aAAa,GAAG;IACpB,KAAK,EAAE,IAAI,IAAI,CACb,WAAW,CAAC,KAAK,EACjB,OAAO,EACP,iCAAmB,CAAC,KAAK,CAC1B,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC;IACnC,KAAK,EAAE,IAAI,IAAI,CACb,WAAW,CAAC,KAAK,EACjB,OAAO,EACP,iCAAmB,CAAC,KAAK,CAC1B,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC;IACnC,KAAK,EAAE,IAAI,IAAI,CACb,WAAW,CAAC,KAAK,EACjB,OAAO,EACP,iCAAmB,CAAC,KAAK,CAC1B,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,iCAAmB,CAAC,MAAM,CAAC;IAC1E,OAAO,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,iCAAmB,CAAC,KAAK,CAAC;CAC7E,CAAA;AAED,SAAgB,eAAe;IAC7B,OAAO,IAAA,mBAAS,EAAC,aAAa,CAAC,CAAA;AACjC,CAAC;AAFD,0CAEC;
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/security/roles.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const docIds_1 = require("../../../../src/docIds");
|
|
|
9
9
|
const types_1 = require("@budibase/types");
|
|
10
10
|
const sample_1 = __importDefault(require("lodash/sample"));
|
|
11
11
|
const account = (partial = {}) => {
|
|
12
|
-
return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email(), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true, tier: "FREE", authType: types_1.AuthType.PASSWORD, name: _1.generator.name(), size: "10+", profession: "Software Engineer", quotaUsage: _1.quotas.usage() }, partial);
|
|
12
|
+
return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email({ domain: "example.com" }), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true, tier: "FREE", authType: types_1.AuthType.PASSWORD, name: _1.generator.name(), size: "10+", profession: "Software Engineer", quotaUsage: _1.quotas.usage() }, partial);
|
|
13
13
|
};
|
|
14
14
|
exports.account = account;
|
|
15
15
|
function selfHostAccount() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":";;;;;;AAAA,wBAA2C;AAC3C,mDAA6D;AAC7D,2CAWwB;AACxB,2DAAkC;AAE3B,MAAM,OAAO,GAAG,CAAC,UAA4B,EAAE,EAAW,EAAE;IACjE,uBACE,SAAS,EAAE,IAAA,OAAI,GAAE,EACjB,QAAQ,EAAE,YAAS,CAAC,IAAI,EAAE,EAC1B,KAAK,EAAE,YAAS,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const generator_1 = require("./generator");
|
|
|
6
6
|
function createUserRequest(userData) {
|
|
7
7
|
const defaultValues = {
|
|
8
8
|
externalId: (0, common_1.uuid)(),
|
|
9
|
-
email:
|
|
9
|
+
email: `${(0, common_1.uuid)()}@example.com`,
|
|
10
10
|
firstName: generator_1.generator.first(),
|
|
11
11
|
lastName: generator_1.generator.last(),
|
|
12
12
|
username: generator_1.generator.name(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scim.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/scim.ts"],"names":[],"mappings":";;;AACA,qCAA+B;AAC/B,2CAAuC;AAUvC,SAAgB,iBAAiB,CAAC,QAA2C;IAC3E,MAAM,aAAa,GAAG;QACpB,UAAU,EAAE,IAAA,aAAI,GAAE;QAClB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"scim.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/scim.ts"],"names":[],"mappings":";;;AACA,qCAA+B;AAC/B,2CAAuC;AAUvC,SAAgB,iBAAiB,CAAC,QAA2C;IAC3E,MAAM,aAAa,GAAG;QACpB,UAAU,EAAE,IAAA,aAAI,GAAE;QAClB,KAAK,EAAE,GAAG,IAAA,aAAI,GAAE,cAAc;QAC9B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE;QAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE;QAC1B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE;KAC3B,CAAA;IAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,mCACrD,aAAa,GACb,QAAQ,CACZ,CAAA;IAED,IAAI,IAAI,GAA0B;QAChC,OAAO,EAAE;YACP,4CAA4C;YAC5C,4DAA4D;SAC7D;QACD,UAAU;QACV,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE;YACN;gBACE,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,KAAK;aACb;SACF;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,MAAM;SACrB;QACD,KAAK,EAAE,EAAE;KACV,CAAA;IAED,IAAI,SAAS,IAAI,QAAQ,EAAE;QACzB,IAAI,CAAC,IAAI,GAAG;YACV,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACzD,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,SAAS;SACrB,CAAA;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5CD,8CA4CC;AAED,SAAgB,kBAAkB,CAAC,SAGlC;IACC,MAAM,EAAE,UAAU,GAAG,IAAA,aAAI,GAAE,EAAE,WAAW,GAAG,qBAAS,CAAC,IAAI,EAAE,EAAE,GAC3D,SAAS,IAAI,EAAE,CAAA;IAEjB,MAAM,KAAK,GAA2B;QACpC,OAAO,EAAE;YACP,6CAA6C;YAC7C,0EAA0E;SAC3E;QACD,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE;YACJ,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,IAAI,IAAI,EAAE;YACnB,YAAY,EAAE,IAAI,IAAI,EAAE;SACzB;KACF,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AArBD,gDAqBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.21.
|
|
3
|
+
"version": "2.21.4",
|
|
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.10",
|
|
26
|
-
"@budibase/shared-core": "2.21.
|
|
27
|
-
"@budibase/types": "2.21.
|
|
26
|
+
"@budibase/shared-core": "2.21.4",
|
|
27
|
+
"@budibase/types": "2.21.4",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"@types/lodash": "4.14.200",
|
|
68
68
|
"@types/node-fetch": "2.6.4",
|
|
69
69
|
"@types/pouchdb": "6.4.0",
|
|
70
|
-
"@types/redlock": "4.0.
|
|
70
|
+
"@types/redlock": "4.0.7",
|
|
71
71
|
"@types/semver": "7.3.7",
|
|
72
72
|
"@types/tar-fs": "2.0.1",
|
|
73
73
|
"@types/uuid": "8.3.4",
|
|
@@ -78,6 +78,7 @@
|
|
|
78
78
|
"jest-serial-runner": "1.2.1",
|
|
79
79
|
"pino-pretty": "10.0.0",
|
|
80
80
|
"pouchdb-adapter-memory": "7.2.2",
|
|
81
|
+
"testcontainers": "^10.7.2",
|
|
81
82
|
"timekeeper": "2.2.0",
|
|
82
83
|
"typescript": "5.2.2"
|
|
83
84
|
},
|
|
@@ -96,5 +97,5 @@
|
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
99
|
},
|
|
99
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "d2d0f85a7981f8813929a100066ffe49beff00fd"
|
|
100
101
|
}
|
package/src/cache/user.ts
CHANGED
|
@@ -6,7 +6,7 @@ import env from "../environment"
|
|
|
6
6
|
import * as accounts from "../accounts"
|
|
7
7
|
import { UserDB } from "../users"
|
|
8
8
|
import { sdk } from "@budibase/shared-core"
|
|
9
|
-
import { User } from "@budibase/types"
|
|
9
|
+
import { User, UserMetadata } from "@budibase/types"
|
|
10
10
|
|
|
11
11
|
const EXPIRY_SECONDS = 3600
|
|
12
12
|
|
|
@@ -15,7 +15,7 @@ const EXPIRY_SECONDS = 3600
|
|
|
15
15
|
*/
|
|
16
16
|
async function populateFromDB(userId: string, tenantId: string) {
|
|
17
17
|
const db = tenancy.getTenantDB(tenantId)
|
|
18
|
-
const user = await db.get<
|
|
18
|
+
const user = await db.get<UserMetadata>(userId)
|
|
19
19
|
user.budibaseAccess = true
|
|
20
20
|
if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
|
|
21
21
|
const account = await accounts.getAccount(user.email)
|
package/src/db/Replication.ts
CHANGED
|
@@ -1,66 +1,57 @@
|
|
|
1
|
+
import PouchDB from "pouchdb"
|
|
1
2
|
import { getPouchDB, closePouchDB } from "./couch"
|
|
2
3
|
import { DocumentType } from "../constants"
|
|
3
4
|
|
|
4
5
|
class Replication {
|
|
5
|
-
source:
|
|
6
|
-
target:
|
|
7
|
-
replication: any
|
|
6
|
+
source: PouchDB.Database
|
|
7
|
+
target: PouchDB.Database
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
*
|
|
11
|
-
* @param source - the DB you want to replicate or rollback to
|
|
12
|
-
* @param target - the DB you want to replicate to, or rollback from
|
|
13
|
-
*/
|
|
14
|
-
constructor({ source, target }: any) {
|
|
9
|
+
constructor({ source, target }: { source: string; target: string }) {
|
|
15
10
|
this.source = getPouchDB(source)
|
|
16
11
|
this.target = getPouchDB(target)
|
|
17
12
|
}
|
|
18
13
|
|
|
19
|
-
close() {
|
|
20
|
-
|
|
14
|
+
async close() {
|
|
15
|
+
await Promise.all([closePouchDB(this.source), closePouchDB(this.target)])
|
|
21
16
|
}
|
|
22
17
|
|
|
23
|
-
|
|
24
|
-
return new Promise(resolve => {
|
|
25
|
-
|
|
26
|
-
.
|
|
18
|
+
replicate(opts: PouchDB.Replication.ReplicateOptions = {}) {
|
|
19
|
+
return new Promise<PouchDB.Replication.ReplicationResult<{}>>(resolve => {
|
|
20
|
+
this.source.replicate
|
|
21
|
+
.to(this.target, opts)
|
|
22
|
+
.on("denied", function (err) {
|
|
27
23
|
// a document failed to replicate (e.g. due to permissions)
|
|
28
24
|
throw new Error(`Denied: Document failed to replicate ${err}`)
|
|
29
25
|
})
|
|
30
|
-
.on("complete", function (info
|
|
26
|
+
.on("complete", function (info) {
|
|
31
27
|
return resolve(info)
|
|
32
28
|
})
|
|
33
|
-
.on("error", function (err
|
|
29
|
+
.on("error", function (err) {
|
|
34
30
|
throw new Error(`Replication Error: ${err}`)
|
|
35
31
|
})
|
|
36
32
|
})
|
|
37
33
|
}
|
|
38
34
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return this.replication
|
|
46
|
-
}
|
|
35
|
+
appReplicateOpts(
|
|
36
|
+
opts: PouchDB.Replication.ReplicateOptions = {}
|
|
37
|
+
): PouchDB.Replication.ReplicateOptions {
|
|
38
|
+
if (typeof opts.filter === "string") {
|
|
39
|
+
return opts
|
|
40
|
+
}
|
|
47
41
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
* @param opts - PouchDB replication options
|
|
51
|
-
*/
|
|
52
|
-
replicate(opts = {}) {
|
|
53
|
-
this.replication = this.promisify(this.source.replicate.to, opts)
|
|
54
|
-
return this.replication
|
|
55
|
-
}
|
|
42
|
+
const filter = opts.filter
|
|
43
|
+
delete opts.filter
|
|
56
44
|
|
|
57
|
-
appReplicateOpts() {
|
|
58
45
|
return {
|
|
59
|
-
|
|
46
|
+
...opts,
|
|
47
|
+
filter: (doc: any, params: any) => {
|
|
60
48
|
if (doc._id && doc._id.startsWith(DocumentType.AUTOMATION_LOG)) {
|
|
61
49
|
return false
|
|
62
50
|
}
|
|
63
|
-
|
|
51
|
+
if (doc._id === DocumentType.APP_METADATA) {
|
|
52
|
+
return false
|
|
53
|
+
}
|
|
54
|
+
return filter ? filter(doc, params) : true
|
|
64
55
|
},
|
|
65
56
|
}
|
|
66
57
|
}
|
|
@@ -75,10 +66,6 @@ class Replication {
|
|
|
75
66
|
// take the opportunity to remove deleted tombstones
|
|
76
67
|
await this.replicate()
|
|
77
68
|
}
|
|
78
|
-
|
|
79
|
-
cancel() {
|
|
80
|
-
this.replication.cancel()
|
|
81
|
-
}
|
|
82
69
|
}
|
|
83
70
|
|
|
84
71
|
export default Replication
|