@budibase/backend-core 3.28.3 → 3.30.0
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 +11 -11
- package/dist/index.js.map +2 -2
- package/dist/package.json +2 -2
- package/dist/src/cache/invite.js +2 -31
- package/dist/src/cache/invite.js.map +1 -1
- package/dist/src/environment.d.ts +2 -2
- package/dist/src/environment.js +2 -2
- package/dist/src/environment.js.map +1 -1
- package/dist/src/redis/init.d.ts +0 -1
- package/dist/src/redis/init.js +1 -12
- package/dist/src/redis/init.js.map +1 -1
- package/dist/src/redis/utils.d.ts +0 -1
- package/dist/src/redis/utils.js +0 -1
- package/dist/src/redis/utils.js.map +1 -1
- package/dist/src/security/encryption.d.ts +1 -0
- package/dist/src/utils/utils.js +11 -3
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tests/core/cache/invite.spec.js +12 -22
- package/dist/tests/core/cache/invite.spec.js.map +1 -1
- package/package.json +2 -2
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.30.0",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "58456cc695d2c71a354bcf5c064943b247ad4969"
|
|
116
116
|
}
|
package/dist/src/cache/invite.js
CHANGED
|
@@ -41,9 +41,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
41
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
42
|
});
|
|
43
43
|
};
|
|
44
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
45
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
|
-
};
|
|
47
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
45
|
exports.updateCode = updateCode;
|
|
49
46
|
exports.createCode = createCode;
|
|
@@ -53,7 +50,6 @@ exports.getInviteCodes = getInviteCodes;
|
|
|
53
50
|
exports.getExistingInvites = getExistingInvites;
|
|
54
51
|
const utils = __importStar(require("../utils"));
|
|
55
52
|
const utils_1 = require("../utils");
|
|
56
|
-
const environment_1 = __importDefault(require("../environment"));
|
|
57
53
|
const context_1 = require("../context");
|
|
58
54
|
const redis = __importStar(require("../redis/init"));
|
|
59
55
|
const locks = __importStar(require("../redis/redlockImpl"));
|
|
@@ -138,11 +134,6 @@ function findInviteInList(code, tenantId) {
|
|
|
138
134
|
*/
|
|
139
135
|
function updateCode(code, value) {
|
|
140
136
|
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
-
const client = yield redis.getInviteClient();
|
|
142
|
-
const legacyExists = yield client.exists(code);
|
|
143
|
-
if (legacyExists) {
|
|
144
|
-
yield client.store(code, value, TTL_SECONDS);
|
|
145
|
-
}
|
|
146
137
|
const info = Object.assign({}, value.info);
|
|
147
138
|
const tenantId = info.tenantId || (0, context_1.getTenantId)();
|
|
148
139
|
info.tenantId = tenantId;
|
|
@@ -195,11 +186,6 @@ function createCode(email, info) {
|
|
|
195
186
|
*/
|
|
196
187
|
function getCode(code, tenantId) {
|
|
197
188
|
return __awaiter(this, void 0, void 0, function* () {
|
|
198
|
-
const client = yield redis.getInviteClient();
|
|
199
|
-
const value = (yield client.get(code));
|
|
200
|
-
if (value) {
|
|
201
|
-
return value;
|
|
202
|
-
}
|
|
203
189
|
const resolvedTenantId = tenantId || (0, context_1.getTenantId)();
|
|
204
190
|
return yield withInviteListLock(resolvedTenantId, () => __awaiter(this, void 0, void 0, function* () {
|
|
205
191
|
const found = yield findInviteInList(code, resolvedTenantId);
|
|
@@ -218,8 +204,6 @@ function getCode(code, tenantId) {
|
|
|
218
204
|
}
|
|
219
205
|
function deleteCode(code, tenantId) {
|
|
220
206
|
return __awaiter(this, void 0, void 0, function* () {
|
|
221
|
-
const client = yield redis.getInviteClient();
|
|
222
|
-
yield client.delete(code);
|
|
223
207
|
const resolvedTenantId = tenantId || (0, context_1.getTenantId)();
|
|
224
208
|
try {
|
|
225
209
|
yield withInviteListLock(resolvedTenantId, () => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -241,7 +225,6 @@ function deleteCode(code, tenantId) {
|
|
|
241
225
|
**/
|
|
242
226
|
function getInviteCodes() {
|
|
243
227
|
return __awaiter(this, void 0, void 0, function* () {
|
|
244
|
-
var _a;
|
|
245
228
|
const tenantId = (0, context_1.getTenantId)();
|
|
246
229
|
const list = yield withInviteListLock(tenantId, () => __awaiter(this, void 0, void 0, function* () {
|
|
247
230
|
let found = (yield loadInviteList(tenantId)) || {
|
|
@@ -259,25 +242,13 @@ function getInviteCodes() {
|
|
|
259
242
|
for (const [code, invite] of Object.entries(list.invites)) {
|
|
260
243
|
results.set(code, toInviteWithCode(code, invite));
|
|
261
244
|
}
|
|
262
|
-
const client = yield redis.getInviteClient();
|
|
263
|
-
const legacyInvites = yield client.scan();
|
|
264
|
-
for (const invite of legacyInvites) {
|
|
265
|
-
if (!((_a = invite === null || invite === void 0 ? void 0 : invite.value) === null || _a === void 0 ? void 0 : _a.info)) {
|
|
266
|
-
continue;
|
|
267
|
-
}
|
|
268
|
-
if (environment_1.default.MULTI_TENANCY && invite.value.info.tenantId !== tenantId) {
|
|
269
|
-
continue;
|
|
270
|
-
}
|
|
271
|
-
if (!results.has(invite.key)) {
|
|
272
|
-
results.set(invite.key, Object.assign(Object.assign({}, invite.value), { code: invite.key }));
|
|
273
|
-
}
|
|
274
|
-
}
|
|
275
245
|
return Array.from(results.values());
|
|
276
246
|
});
|
|
277
247
|
}
|
|
278
248
|
function getExistingInvites(emails) {
|
|
279
249
|
return __awaiter(this, void 0, void 0, function* () {
|
|
280
|
-
|
|
250
|
+
const lcEmails = new Set(emails.map(email => email.toLowerCase()));
|
|
251
|
+
return (yield getInviteCodes()).filter(invite => lcEmails.has(invite.email.toLowerCase()));
|
|
281
252
|
});
|
|
282
253
|
}
|
|
283
254
|
//# sourceMappingURL=invite.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invite.js","sourceRoot":"","sources":["../../../src/cache/invite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"invite.js","sourceRoot":"","sources":["../../../src/cache/invite.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ declare const environment: {
|
|
|
24
24
|
CUSTOM_CSP_FONT_SRC: string | undefined;
|
|
25
25
|
CUSTOM_CSP_FRAME_SRC: string | undefined;
|
|
26
26
|
BBAI_OPENAI_API_KEY: string | undefined;
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
BBAI_OPENROUTER_API_KEY: string | undefined;
|
|
28
|
+
OPENROUTER_BASE_URL: string;
|
|
29
29
|
VERSION: string;
|
|
30
30
|
SERVICE_NAME: string;
|
|
31
31
|
isTest: typeof isTest;
|
package/dist/src/environment.js
CHANGED
|
@@ -147,7 +147,7 @@ const environment = Object.assign(Object.assign({ isTest,
|
|
|
147
147
|
process.env[key] = value;
|
|
148
148
|
// @ts-ignore
|
|
149
149
|
environment[key] = value;
|
|
150
|
-
}, ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M", ENABLE_SCIM_LOGGER: process.env.ENABLE_SCIM_LOGGER, BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL, BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD, OPENAI_API_KEY: process.env.OPENAI_API_KEY, MIN_VERSION_WITHOUT_POWER_ROLE: process.env.MIN_VERSION_WITHOUT_POWER_ROLE || "3.0.0", DISABLE_CONTENT_SECURITY_POLICY: process.env.DISABLE_CONTENT_SECURITY_POLICY, BSON_BUFFER_SIZE: parseIntSafe(process.env.BSON_BUFFER_SIZE), CUSTOM_CSP_MEDIA_SRC: process.env.CUSTOM_CSP_MEDIA_SRC, CUSTOM_CSP_SCRIPT_SRC: process.env.CUSTOM_CSP_SCRIPT_SRC, CUSTOM_CSP_CONNECT_SRC: process.env.CUSTOM_CSP_CONNECT_SRC, CUSTOM_CSP_IMG_SRC: process.env.CUSTOM_CSP_IMG_SRC, CUSTOM_CSP_FONT_SRC: process.env.CUSTOM_CSP_FONT_SRC, CUSTOM_CSP_FRAME_SRC: process.env.CUSTOM_CSP_FRAME_SRC, BBAI_OPENAI_API_KEY: process.env.BBAI_OPENAI_API_KEY,
|
|
150
|
+
}, ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M", ENABLE_SCIM_LOGGER: process.env.ENABLE_SCIM_LOGGER, BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL, BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD, OPENAI_API_KEY: process.env.OPENAI_API_KEY, MIN_VERSION_WITHOUT_POWER_ROLE: process.env.MIN_VERSION_WITHOUT_POWER_ROLE || "3.0.0", DISABLE_CONTENT_SECURITY_POLICY: process.env.DISABLE_CONTENT_SECURITY_POLICY, BSON_BUFFER_SIZE: parseIntSafe(process.env.BSON_BUFFER_SIZE), CUSTOM_CSP_MEDIA_SRC: process.env.CUSTOM_CSP_MEDIA_SRC, CUSTOM_CSP_SCRIPT_SRC: process.env.CUSTOM_CSP_SCRIPT_SRC, CUSTOM_CSP_CONNECT_SRC: process.env.CUSTOM_CSP_CONNECT_SRC, CUSTOM_CSP_IMG_SRC: process.env.CUSTOM_CSP_IMG_SRC, CUSTOM_CSP_FONT_SRC: process.env.CUSTOM_CSP_FONT_SRC, CUSTOM_CSP_FRAME_SRC: process.env.CUSTOM_CSP_FRAME_SRC, BBAI_OPENAI_API_KEY: process.env.BBAI_OPENAI_API_KEY, BBAI_OPENROUTER_API_KEY: process.env.BBAI_OPENROUTER_API_KEY, OPENROUTER_BASE_URL: process.env.OPENROUTER_BASE_URL || "https://openrouter.ai/api/v1" });
|
|
151
151
|
function setEnv(newEnvVars) {
|
|
152
152
|
const oldEnv = (0, lodash_1.cloneDeep)(environment);
|
|
153
153
|
let key;
|
|
@@ -187,7 +187,7 @@ exports.SECRETS = [
|
|
|
187
187
|
"REDIS_PASSWORD",
|
|
188
188
|
"REDIS_USERNAME",
|
|
189
189
|
"BBAI_OPENAI_API_KEY",
|
|
190
|
-
"
|
|
190
|
+
"BBAI_OPENROUTER_API_KEY",
|
|
191
191
|
];
|
|
192
192
|
// clean up any environment variable edge cases
|
|
193
193
|
for (let [key, value] of Object.entries(environment)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}
|
package/dist/src/redis/init.d.ts
CHANGED
|
@@ -9,7 +9,6 @@ export declare function getOpenapiImportSpecsClient(): Promise<Client>;
|
|
|
9
9
|
export declare function getWritethroughClient(): Promise<Client>;
|
|
10
10
|
export declare function getLockClient(): Promise<Client>;
|
|
11
11
|
export declare function getSocketClient(): Promise<Client>;
|
|
12
|
-
export declare function getInviteClient(): Promise<Client>;
|
|
13
12
|
export declare function getInviteListClient(): Promise<Client>;
|
|
14
13
|
export declare function getPasswordResetClient(): Promise<Client>;
|
|
15
14
|
export declare function getDocWritethroughClient(): Promise<Client>;
|
package/dist/src/redis/init.js
CHANGED
|
@@ -55,13 +55,12 @@ exports.getOpenapiImportSpecsClient = getOpenapiImportSpecsClient;
|
|
|
55
55
|
exports.getWritethroughClient = getWritethroughClient;
|
|
56
56
|
exports.getLockClient = getLockClient;
|
|
57
57
|
exports.getSocketClient = getSocketClient;
|
|
58
|
-
exports.getInviteClient = getInviteClient;
|
|
59
58
|
exports.getInviteListClient = getInviteListClient;
|
|
60
59
|
exports.getPasswordResetClient = getPasswordResetClient;
|
|
61
60
|
exports.getDocWritethroughClient = getDocWritethroughClient;
|
|
62
61
|
const redis_1 = __importDefault(require("./redis"));
|
|
63
62
|
const utils = __importStar(require("./utils"));
|
|
64
|
-
let userClient, sessionClient, workspaceClient, cacheClient, openapiImportSpecsClient, writethroughClient, lockClient, socketClient,
|
|
63
|
+
let userClient, sessionClient, workspaceClient, cacheClient, openapiImportSpecsClient, writethroughClient, lockClient, socketClient, inviteListClient, passwordResetClient, docWritethroughClient;
|
|
65
64
|
function init() {
|
|
66
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
67
66
|
userClient = yield redis_1.default.init(utils.Databases.USER_CACHE);
|
|
@@ -71,7 +70,6 @@ function init() {
|
|
|
71
70
|
openapiImportSpecsClient = yield redis_1.default.init(utils.Databases.OPENAPI_IMPORT_SPECS, utils.SelectableDatabase.OPENAPI_IMPORT_SPECS);
|
|
72
71
|
lockClient = yield redis_1.default.init(utils.Databases.LOCKS);
|
|
73
72
|
writethroughClient = yield redis_1.default.init(utils.Databases.WRITE_THROUGH);
|
|
74
|
-
inviteClient = yield redis_1.default.init(utils.Databases.INVITATIONS);
|
|
75
73
|
inviteListClient = yield redis_1.default.init(utils.Databases.INVITATIONS_LIST);
|
|
76
74
|
passwordResetClient = yield redis_1.default.init(utils.Databases.PW_RESETS);
|
|
77
75
|
socketClient = yield redis_1.default.init(utils.Databases.SOCKET_IO, utils.SelectableDatabase.SOCKET_IO);
|
|
@@ -87,7 +85,6 @@ function shutdown() {
|
|
|
87
85
|
yield (openapiImportSpecsClient === null || openapiImportSpecsClient === void 0 ? void 0 : openapiImportSpecsClient.finish());
|
|
88
86
|
yield (writethroughClient === null || writethroughClient === void 0 ? void 0 : writethroughClient.finish());
|
|
89
87
|
yield (lockClient === null || lockClient === void 0 ? void 0 : lockClient.finish());
|
|
90
|
-
yield (inviteClient === null || inviteClient === void 0 ? void 0 : inviteClient.finish());
|
|
91
88
|
yield (inviteListClient === null || inviteListClient === void 0 ? void 0 : inviteListClient.finish());
|
|
92
89
|
yield (passwordResetClient === null || passwordResetClient === void 0 ? void 0 : passwordResetClient.finish());
|
|
93
90
|
yield (socketClient === null || socketClient === void 0 ? void 0 : socketClient.finish());
|
|
@@ -161,14 +158,6 @@ function getSocketClient() {
|
|
|
161
158
|
return socketClient;
|
|
162
159
|
});
|
|
163
160
|
}
|
|
164
|
-
function getInviteClient() {
|
|
165
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
166
|
-
if (!inviteClient) {
|
|
167
|
-
yield init();
|
|
168
|
-
}
|
|
169
|
-
return inviteClient;
|
|
170
|
-
});
|
|
171
|
-
}
|
|
172
161
|
function getInviteListClient() {
|
|
173
162
|
return __awaiter(this, void 0, void 0, function* () {
|
|
174
163
|
if (!inviteListClient) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":"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"}
|
package/dist/src/redis/utils.js
CHANGED
|
@@ -22,7 +22,6 @@ var Databases;
|
|
|
22
22
|
(function (Databases) {
|
|
23
23
|
Databases["PW_RESETS"] = "pwReset";
|
|
24
24
|
Databases["VERIFICATIONS"] = "verification";
|
|
25
|
-
Databases["INVITATIONS"] = "invitation";
|
|
26
25
|
Databases["INVITATIONS_LIST"] = "invitationList";
|
|
27
26
|
Databases["DEV_LOCKS"] = "devLocks";
|
|
28
27
|
Databases["DEBOUNCE"] = "debounce";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare enum SecretOption {
|
|
|
5
5
|
export declare function getSecret(secretOption: SecretOption): string;
|
|
6
6
|
export declare function encrypt(input: string, secretOption?: SecretOption): string;
|
|
7
7
|
export declare function decrypt(input: string, secretOption?: SecretOption): string;
|
|
8
|
+
export declare function compare(plain: string, encrypted: string, secretOption?: SecretOption): boolean;
|
|
8
9
|
export declare function encryptFile({ dir, filename }: {
|
|
9
10
|
dir: string;
|
|
10
11
|
filename: string;
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -69,9 +69,14 @@ const environment_1 = __importDefault(require("../environment"));
|
|
|
69
69
|
const tenancy = __importStar(require("../tenancy"));
|
|
70
70
|
const WORKSPACE_PREFIX = constants_1.DocumentType.WORKSPACE + constants_1.SEPARATOR;
|
|
71
71
|
const PROD_APP_PREFIX = "/app/";
|
|
72
|
+
const PROD_CHAT_PREFIX = "/app-chat/";
|
|
72
73
|
function resolveAppUrl(ctx) {
|
|
73
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
const
|
|
75
|
+
const pathParts = ctx.path.split("/");
|
|
76
|
+
const workspaceUrl = pathParts[2];
|
|
77
|
+
if (!workspaceUrl) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
75
80
|
let possibleUrl = `/${workspaceUrl.toLowerCase()}`;
|
|
76
81
|
let tenantId = context.getTenantId();
|
|
77
82
|
if (!environment_1.default.isDev() && environment_1.default.MULTI_TENANCY) {
|
|
@@ -94,7 +99,8 @@ function isServingApp(ctx) {
|
|
|
94
99
|
return true;
|
|
95
100
|
}
|
|
96
101
|
// prod workspace
|
|
97
|
-
return ctx.path.startsWith(PROD_APP_PREFIX)
|
|
102
|
+
return (ctx.path.startsWith(PROD_APP_PREFIX) ||
|
|
103
|
+
ctx.path.startsWith(PROD_CHAT_PREFIX));
|
|
98
104
|
}
|
|
99
105
|
function isServingBuilder(ctx) {
|
|
100
106
|
return ctx.path.startsWith("/builder/workspace/");
|
|
@@ -154,7 +160,9 @@ function getWorkspaceIdFromCtx(ctx) {
|
|
|
154
160
|
// filter out the builder preview path which collides with the prod app path
|
|
155
161
|
// to ensure we don't load all apps excessively
|
|
156
162
|
const isBuilderPreview = isBuilderPreviewUrl(ctx.path);
|
|
157
|
-
const isViewingProdApp = ctx.path.startsWith(PROD_APP_PREFIX)
|
|
163
|
+
const isViewingProdApp = (ctx.path.startsWith(PROD_APP_PREFIX) ||
|
|
164
|
+
ctx.path.startsWith(PROD_CHAT_PREFIX)) &&
|
|
165
|
+
!isBuilderPreview;
|
|
158
166
|
if (isViewingProdApp) {
|
|
159
167
|
setWorkspaceIdIfValid(yield resolveAppUrl(ctx));
|
|
160
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
const inviteCache = __importStar(require("../../../src/cache/invite"));
|
|
46
46
|
const environment_1 = require("../../../src/environment");
|
|
47
47
|
const redis = __importStar(require("../../../src/redis/init"));
|
|
48
|
-
const utils_1 = require("../../../src/utils");
|
|
49
48
|
const extra_1 = require("../../extra");
|
|
50
49
|
describe("invite cache", () => {
|
|
51
50
|
let resetEnv;
|
|
@@ -56,8 +55,6 @@ describe("invite cache", () => {
|
|
|
56
55
|
resetEnv === null || resetEnv === void 0 ? void 0 : resetEnv();
|
|
57
56
|
});
|
|
58
57
|
afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
|
-
const inviteClient = yield redis.getInviteClient();
|
|
60
|
-
yield inviteClient.clear();
|
|
61
58
|
const inviteListClient = yield redis.getInviteListClient();
|
|
62
59
|
yield inviteListClient.clear();
|
|
63
60
|
}));
|
|
@@ -71,25 +68,6 @@ describe("invite cache", () => {
|
|
|
71
68
|
expect(invite.info.tenantId).toBe(tenantId);
|
|
72
69
|
const invites = yield inviteCache.getInviteCodes();
|
|
73
70
|
expect(invites.some(inv => inv.code === code)).toBe(true);
|
|
74
|
-
const inviteClient = yield redis.getInviteClient();
|
|
75
|
-
expect(yield inviteClient.exists(code)).toBe(0);
|
|
76
|
-
}));
|
|
77
|
-
}));
|
|
78
|
-
it("combines legacy invites with tenant list", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
79
|
-
yield extra_1.testEnv.withTenant((tenantId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
80
|
-
const inviteClient = yield redis.getInviteClient();
|
|
81
|
-
const code = `legacy-${(0, utils_1.newid)()}`;
|
|
82
|
-
yield inviteClient.store(code, {
|
|
83
|
-
email: "legacy@budibase.com",
|
|
84
|
-
info: { tenantId },
|
|
85
|
-
}, utils_1.Duration.fromDays(7).toSeconds());
|
|
86
|
-
const invites = yield inviteCache.getInviteCodes();
|
|
87
|
-
expect(invites.some(inv => inv.code === code)).toBe(true);
|
|
88
|
-
const inviteListClient = yield redis.getInviteListClient();
|
|
89
|
-
const list = (yield inviteListClient.get(tenantId));
|
|
90
|
-
if (list) {
|
|
91
|
-
expect(list.invites[code]).toBeUndefined();
|
|
92
|
-
}
|
|
93
71
|
}));
|
|
94
72
|
}));
|
|
95
73
|
it("deletes list invites", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -105,5 +83,17 @@ describe("invite cache", () => {
|
|
|
105
83
|
expect(list.invites[code]).toBeUndefined();
|
|
106
84
|
}));
|
|
107
85
|
}));
|
|
86
|
+
it("matches existing invites regardless of email casing", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
+
yield extra_1.testEnv.withTenant((tenantId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
88
|
+
yield inviteCache.createCode("mixed.case@budibase.com", {
|
|
89
|
+
tenantId,
|
|
90
|
+
});
|
|
91
|
+
const invites = yield inviteCache.getExistingInvites([
|
|
92
|
+
"MIXED.CASE@BUDIBASE.COM",
|
|
93
|
+
]);
|
|
94
|
+
expect(invites).toHaveLength(1);
|
|
95
|
+
expect(invites[0].email).toBe("mixed.case@budibase.com");
|
|
96
|
+
}));
|
|
97
|
+
}));
|
|
108
98
|
});
|
|
109
99
|
//# sourceMappingURL=invite.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invite.spec.js","sourceRoot":"","sources":["../../../../tests/core/cache/invite.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uEAAwD;AACxD,0DAAiD;AACjD,+DAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"invite.spec.js","sourceRoot":"","sources":["../../../../tests/core/cache/invite.spec.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": "3.
|
|
3
|
+
"version": "3.30.0",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "58456cc695d2c71a354bcf5c064943b247ad4969"
|
|
116
116
|
}
|