@budibase/backend-core 3.24.2 → 3.24.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 +15 -15
- package/dist/index.js.map +3 -3
- package/dist/package.json +2 -2
- package/dist/src/configs/configs.d.ts +3 -1
- package/dist/src/configs/configs.js +55 -0
- package/dist/src/configs/configs.js.map +1 -1
- package/dist/src/docIds/ids.d.ts +3 -0
- package/dist/src/docIds/ids.js +13 -1
- package/dist/src/docIds/ids.js.map +1 -1
- package/dist/src/environment.d.ts +1 -0
- package/dist/src/environment.js +2 -1
- package/dist/src/environment.js.map +1 -1
- package/dist/src/redis/utils.d.ts +1 -0
- package/dist/src/redis/utils.js +10 -10
- package/dist/src/redis/utils.js.map +1 -1
- package/dist/tests/core/utilities/mocks/licenses.d.ts +1 -0
- package/dist/tests/core/utilities/mocks/licenses.js +5 -1
- package/dist/tests/core/utilities/mocks/licenses.js.map +1 -1
- package/dist/tests/redis/utils.spec.d.ts +1 -0
- package/dist/tests/redis/utils.spec.js +64 -0
- package/dist/tests/redis/utils.spec.js.map +1 -0
- 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.24.
|
|
3
|
+
"version": "3.24.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",
|
|
@@ -113,5 +113,5 @@
|
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
},
|
|
116
|
-
"gitHead": "
|
|
116
|
+
"gitHead": "6d1812ff9a22270318eaf1f61f4e9af51bbac383"
|
|
117
117
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AIConfig, Config, ConfigType, GoogleInnerConfig, OIDCInnerConfig, OIDCLogosConfig, RecaptchaConfig, SCIMInnerConfig, SettingsConfig, SettingsInnerConfig, SMTPConfig, SMTPInnerConfig } from "@budibase/types";
|
|
1
|
+
import { AIConfig, Config, ConfigType, GoogleInnerConfig, OIDCInnerConfig, OIDCLogosConfig, RecaptchaConfig, SCIMInnerConfig, SettingsConfig, SettingsInnerConfig, SMTPConfig, SMTPInnerConfig, TranslationsConfig, TranslationsConfigInner } from "@budibase/types";
|
|
2
2
|
/**
|
|
3
3
|
* Generates a new configuration ID.
|
|
4
4
|
* @returns The new configuration ID which the config doc can be stored under.
|
|
@@ -9,6 +9,8 @@ export declare function save(config: Config): Promise<{
|
|
|
9
9
|
id: string;
|
|
10
10
|
rev: string;
|
|
11
11
|
}>;
|
|
12
|
+
export declare function getTranslationsConfigDoc(): Promise<TranslationsConfig>;
|
|
13
|
+
export declare function getTranslationsConfig(): Promise<TranslationsConfigInner>;
|
|
12
14
|
export declare function getSettingsConfigDoc(): Promise<SettingsConfig>;
|
|
13
15
|
export declare function getSettingsConfig(): Promise<SettingsInnerConfig>;
|
|
14
16
|
export declare function getPlatformUrl(opts?: {
|
|
@@ -49,6 +49,8 @@ exports.analyticsEnabled = void 0;
|
|
|
49
49
|
exports.generateConfigID = generateConfigID;
|
|
50
50
|
exports.getConfig = getConfig;
|
|
51
51
|
exports.save = save;
|
|
52
|
+
exports.getTranslationsConfigDoc = getTranslationsConfigDoc;
|
|
53
|
+
exports.getTranslationsConfig = getTranslationsConfig;
|
|
52
54
|
exports.getSettingsConfigDoc = getSettingsConfigDoc;
|
|
53
55
|
exports.getSettingsConfig = getSettingsConfig;
|
|
54
56
|
exports.getPlatformUrl = getPlatformUrl;
|
|
@@ -76,6 +78,44 @@ const environment_1 = __importDefault(require("../environment"));
|
|
|
76
78
|
function generateConfigID(type) {
|
|
77
79
|
return `${constants_1.DocumentType.CONFIG}${constants_1.SEPARATOR}${type}`;
|
|
78
80
|
}
|
|
81
|
+
const DEFAULT_TRANSLATION_LOCALE = "en";
|
|
82
|
+
function createDefaultTranslationsConfig() {
|
|
83
|
+
return {
|
|
84
|
+
_id: generateConfigID(types_1.ConfigType.TRANSLATIONS),
|
|
85
|
+
type: types_1.ConfigType.TRANSLATIONS,
|
|
86
|
+
config: {
|
|
87
|
+
defaultLocale: DEFAULT_TRANSLATION_LOCALE,
|
|
88
|
+
locales: {
|
|
89
|
+
[DEFAULT_TRANSLATION_LOCALE]: {
|
|
90
|
+
label: "English",
|
|
91
|
+
overrides: {},
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
function prepareTranslationsConfig(config) {
|
|
98
|
+
var _a;
|
|
99
|
+
const defaultLocale = (config === null || config === void 0 ? void 0 : config.defaultLocale) || DEFAULT_TRANSLATION_LOCALE;
|
|
100
|
+
const locales = Object.assign({}, ((_a = config === null || config === void 0 ? void 0 : config.locales) !== null && _a !== void 0 ? _a : {}));
|
|
101
|
+
if (!locales[defaultLocale]) {
|
|
102
|
+
locales[defaultLocale] = {
|
|
103
|
+
label: defaultLocale === DEFAULT_TRANSLATION_LOCALE
|
|
104
|
+
? "English"
|
|
105
|
+
: defaultLocale,
|
|
106
|
+
overrides: {},
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
for (const key of Object.keys(locales)) {
|
|
110
|
+
if (!locales[key].overrides) {
|
|
111
|
+
locales[key] = Object.assign(Object.assign({}, locales[key]), { overrides: {} });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return {
|
|
115
|
+
defaultLocale,
|
|
116
|
+
locales,
|
|
117
|
+
};
|
|
118
|
+
}
|
|
79
119
|
function getConfig(type) {
|
|
80
120
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
121
|
const db = context.getGlobalDB();
|
|
@@ -100,6 +140,21 @@ function save(config) {
|
|
|
100
140
|
return db.put(config);
|
|
101
141
|
});
|
|
102
142
|
}
|
|
143
|
+
function getTranslationsConfigDoc() {
|
|
144
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
145
|
+
const config = yield getConfig(types_1.ConfigType.TRANSLATIONS);
|
|
146
|
+
if (!config) {
|
|
147
|
+
return createDefaultTranslationsConfig();
|
|
148
|
+
}
|
|
149
|
+
config.config = prepareTranslationsConfig(config.config);
|
|
150
|
+
return config;
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
function getTranslationsConfig() {
|
|
154
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
155
|
+
return (yield getTranslationsConfigDoc()).config;
|
|
156
|
+
});
|
|
157
|
+
}
|
|
103
158
|
// SETTINGS
|
|
104
159
|
function getSettingsConfigDoc() {
|
|
105
160
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/configs/configs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/configs/configs.ts"],"names":[],"mappings":"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"}
|
package/dist/src/docIds/ids.d.ts
CHANGED
|
@@ -61,6 +61,9 @@ export declare const generateAgentID: () => string;
|
|
|
61
61
|
export declare const generateChatAppID: () => string;
|
|
62
62
|
export declare const generateChatConversationID: () => string;
|
|
63
63
|
export declare const generateAgentToolSourceID: () => string;
|
|
64
|
+
export declare const generateAgentFileID: (agentId: string) => string;
|
|
64
65
|
export declare const generateAIConfigID: () => string;
|
|
66
|
+
export declare const generateRagConfigID: () => string;
|
|
65
67
|
export declare const generateWorkspaceAppID: () => string;
|
|
66
68
|
export declare const generateWorkspaceFavouriteID: () => string;
|
|
69
|
+
export declare const generateVectorDbID: () => string;
|
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.generateWorkspaceFavouriteID = exports.generateWorkspaceAppID = exports.generateAIConfigID = exports.generateAgentToolSourceID = exports.generateChatConversationID = exports.generateChatAppID = exports.generateAgentID = exports.generateOAuth2LogID = exports.generatePluginID = exports.generateDevInfoID = exports.generateWorkspaceID = void 0;
|
|
3
|
+
exports.generateVectorDbID = exports.generateWorkspaceFavouriteID = exports.generateWorkspaceAppID = exports.generateRagConfigID = exports.generateAIConfigID = exports.generateAgentFileID = exports.generateAgentToolSourceID = exports.generateChatConversationID = exports.generateChatAppID = exports.generateAgentID = exports.generateOAuth2LogID = exports.generatePluginID = exports.generateDevInfoID = exports.generateWorkspaceID = void 0;
|
|
4
4
|
exports.generateTableID = generateTableID;
|
|
5
5
|
exports.generateRowID = generateRowID;
|
|
6
6
|
exports.generateGlobalUserID = generateGlobalUserID;
|
|
@@ -134,10 +134,18 @@ const generateAgentToolSourceID = () => {
|
|
|
134
134
|
return `${constants_1.DocumentType.AGENT_TOOL_SOURCE}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
135
135
|
};
|
|
136
136
|
exports.generateAgentToolSourceID = generateAgentToolSourceID;
|
|
137
|
+
const generateAgentFileID = (agentId) => {
|
|
138
|
+
return `${constants_1.DocumentType.AGENT_FILE}${constants_1.SEPARATOR}${agentId}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
139
|
+
};
|
|
140
|
+
exports.generateAgentFileID = generateAgentFileID;
|
|
137
141
|
const generateAIConfigID = () => {
|
|
138
142
|
return `${constants_1.DocumentType.AI_CONFIG}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
139
143
|
};
|
|
140
144
|
exports.generateAIConfigID = generateAIConfigID;
|
|
145
|
+
const generateRagConfigID = () => {
|
|
146
|
+
return `${constants_1.DocumentType.RAG_CONFIG}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
147
|
+
};
|
|
148
|
+
exports.generateRagConfigID = generateRagConfigID;
|
|
141
149
|
const generateWorkspaceAppID = () => {
|
|
142
150
|
return `${constants_1.DocumentType.WORKSPACE_APP}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
143
151
|
};
|
|
@@ -146,4 +154,8 @@ const generateWorkspaceFavouriteID = () => {
|
|
|
146
154
|
return `${constants_1.DocumentType.WORKSPACE_FAVOURITE}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
147
155
|
};
|
|
148
156
|
exports.generateWorkspaceFavouriteID = generateWorkspaceFavouriteID;
|
|
157
|
+
const generateVectorDbID = () => {
|
|
158
|
+
return `${constants_1.DocumentType.VECTOR_STORE}${constants_1.SEPARATOR}${(0, newid_1.newid)()}`;
|
|
159
|
+
};
|
|
160
|
+
exports.generateVectorDbID = generateVectorDbID;
|
|
149
161
|
//# sourceMappingURL=ids.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,7 @@ declare const environment: {
|
|
|
41
41
|
SALT_ROUNDS: string | undefined;
|
|
42
42
|
REDIS_URL: string;
|
|
43
43
|
REDIS_PASSWORD: string | undefined;
|
|
44
|
+
REDIS_USERNAME: string | undefined;
|
|
44
45
|
REDIS_CLUSTERED: string | undefined;
|
|
45
46
|
MINIO_ACCESS_KEY: string | undefined;
|
|
46
47
|
MINIO_SECRET_KEY: string | undefined;
|
package/dist/src/environment.js
CHANGED
|
@@ -129,7 +129,7 @@ const environment = Object.assign(Object.assign({ isTest,
|
|
|
129
129
|
? (0, crypto_1.createSecretKey)(process.env.JWT_SECRET, "utf8")
|
|
130
130
|
: undefined, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK
|
|
131
131
|
? (0, crypto_1.createSecretKey)(process.env.JWT_SECRET_FALLBACK, "utf8")
|
|
132
|
-
: undefined, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL, COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL || "localhost:6379", REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN, AWS_REGION: process.env.AWS_REGION || "eu-west-1", MINIO_URL: process.env.MINIO_URL, MINIO_ENABLED: process.env.MINIO_ENABLED || 1, S3_IGNORE_SELF_SIGNED: process.env.S3_IGNORE_SELF_SIGNED, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK, MULTI_TENANCY: process.env.MULTI_TENANCY, ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app", INTERNAL_ACCOUNT_PORTAL_URL: process.env.INTERNAL_ACCOUNT_PORTAL_URL ||
|
|
132
|
+
: undefined, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL, COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL || "localhost:6379", REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_USERNAME: process.env.REDIS_USERNAME, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN, AWS_REGION: process.env.AWS_REGION || "eu-west-1", MINIO_URL: process.env.MINIO_URL, MINIO_ENABLED: process.env.MINIO_ENABLED || 1, S3_IGNORE_SELF_SIGNED: process.env.S3_IGNORE_SELF_SIGNED, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK, MULTI_TENANCY: process.env.MULTI_TENANCY, ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app", INTERNAL_ACCOUNT_PORTAL_URL: process.env.INTERNAL_ACCOUNT_PORTAL_URL ||
|
|
133
133
|
process.env.ACCOUNT_PORTAL_URL ||
|
|
134
134
|
"https://account.budibase.app", ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "", BUDICLOUD_URL: process.env.BUDICLOUD_URL || "https://budibase.app", DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL, SELF_HOSTED: selfHosted, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, PLATFORM_URL: process.env.PLATFORM_URL || "", POSTHOG_TOKEN: process.env.POSTHOG_TOKEN, POSTHOG_PERSONAL_TOKEN: process.env.POSTHOG_PERSONAL_TOKEN, POSTHOG_API_HOST: process.env.POSTHOG_API_HOST || "https://us.i.posthog.com", POSTHOG_FEATURE_FLAGS_ENABLED: process.env.POSTHOG_FEATURE_FLAGS_ENABLED, ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS, TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS, CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN, CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64, CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID, BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS, APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS, TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES, GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL, PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS, TEMP_BUCKET_NAME: process.env.TEMP_BUCKET_NAME || DefaultBucketName.TEMP, USE_COUCH: process.env.USE_COUCH || true, MOCK_REDIS: process.env.MOCK_REDIS, DEFAULT_LICENSE: process.env.DEFAULT_LICENSE, SERVICE: getServiceName(), LOG_LEVEL: process.env.LOG_LEVEL || "info", SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD, DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose", HTTP_LOGGING: httpLogging(), ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
|
|
135
135
|
// Couch/search
|
|
@@ -185,6 +185,7 @@ exports.SECRETS = [
|
|
|
185
185
|
"MINIO_SECRET_KEY",
|
|
186
186
|
"OPENAI_API_KEY",
|
|
187
187
|
"REDIS_PASSWORD",
|
|
188
|
+
"REDIS_USERNAME",
|
|
188
189
|
];
|
|
189
190
|
// clean up any environment variable edge cases
|
|
190
191
|
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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"}
|
|
@@ -58,6 +58,7 @@ export declare enum SelectableDatabase {
|
|
|
58
58
|
export declare function getRedisConnectionDetails(): {
|
|
59
59
|
host: string;
|
|
60
60
|
password: string | undefined;
|
|
61
|
+
username: string | undefined;
|
|
61
62
|
port: number;
|
|
62
63
|
};
|
|
63
64
|
export declare function getRedisClusterOptions(): Redis.ClusterOptions;
|
package/dist/src/redis/utils.js
CHANGED
|
@@ -69,14 +69,17 @@ var SelectableDatabase;
|
|
|
69
69
|
})(SelectableDatabase || (exports.SelectableDatabase = SelectableDatabase = {}));
|
|
70
70
|
function getRedisConnectionDetails() {
|
|
71
71
|
let password = environment_1.default.REDIS_PASSWORD;
|
|
72
|
+
let username = environment_1.default.REDIS_USERNAME;
|
|
72
73
|
let url = environment_1.default.REDIS_URL.split("//");
|
|
73
74
|
// get rid of the protocol
|
|
74
75
|
url = url.length > 1 ? url[1] : url[0];
|
|
75
|
-
// check for
|
|
76
|
+
// check for credentials in URL (format: user:pass@host or :pass@host)
|
|
76
77
|
url = url.split("@");
|
|
77
78
|
if (url.length > 1) {
|
|
78
|
-
|
|
79
|
-
|
|
79
|
+
const credentials = url[0].split(":");
|
|
80
|
+
// handle both "user:pass@host" and ":pass@host" formats
|
|
81
|
+
username = username || credentials[0] || undefined;
|
|
82
|
+
password = credentials[1];
|
|
80
83
|
url = url[1];
|
|
81
84
|
}
|
|
82
85
|
else {
|
|
@@ -87,6 +90,7 @@ function getRedisConnectionDetails() {
|
|
|
87
90
|
return {
|
|
88
91
|
host,
|
|
89
92
|
password,
|
|
93
|
+
username,
|
|
90
94
|
// assume default port for redis if invalid found
|
|
91
95
|
port: isNaN(portNumber) ? 6379 : portNumber,
|
|
92
96
|
};
|
|
@@ -99,13 +103,9 @@ function getRedisClusterOptions() {
|
|
|
99
103
|
};
|
|
100
104
|
}
|
|
101
105
|
function getRedisOptions() {
|
|
102
|
-
const { host, password, port } = getRedisConnectionDetails();
|
|
103
|
-
return {
|
|
104
|
-
|
|
105
|
-
port: port,
|
|
106
|
-
host,
|
|
107
|
-
password,
|
|
108
|
-
};
|
|
106
|
+
const { host, password, port, username } = getRedisConnectionDetails();
|
|
107
|
+
return Object.assign({ connectTimeout: 30000, port: port, host,
|
|
108
|
+
password }, (username && { username }));
|
|
109
109
|
}
|
|
110
110
|
function removeDbPrefix(key) {
|
|
111
111
|
let parts = key.split(exports.SEPARATOR);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":";;;;;;AA8DA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export declare const useSyncAutomations: () => License;
|
|
|
23
23
|
export declare const useAppBuilders: () => License;
|
|
24
24
|
export declare const useRecaptcha: () => License;
|
|
25
25
|
export declare const usePkceOidc: () => License;
|
|
26
|
+
export declare const useTranslations: () => License;
|
|
26
27
|
export declare const useBudibaseAI: (opts?: {
|
|
27
28
|
monthlyQuota?: number;
|
|
28
29
|
}) => License;
|
|
@@ -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.setCreatorsQuota = exports.setUsersQuota = exports.setAutomationLogsQuota = exports.useAICustomConfigs = exports.useBudibaseAI = exports.usePkceOidc = exports.useRecaptcha = exports.useAppBuilders = exports.useSyncAutomations = exports.useScimIntegration = exports.useExpandedPublicApi = exports.useAuditLogs = exports.useEnvironmentVariables = exports.useGroups = exports.useEnforceableSSO = exports.useBackups = exports.useCloudFree = exports.useUnlimited = exports.useLicense = void 0;
|
|
15
|
+
exports.setCreatorsQuota = exports.setUsersQuota = exports.setAutomationLogsQuota = exports.useAICustomConfigs = exports.useBudibaseAI = exports.useTranslations = exports.usePkceOidc = exports.useRecaptcha = exports.useAppBuilders = exports.useSyncAutomations = exports.useScimIntegration = exports.useExpandedPublicApi = exports.useAuditLogs = exports.useEnvironmentVariables = exports.useGroups = exports.useEnforceableSSO = exports.useBackups = exports.useCloudFree = exports.useUnlimited = exports.useLicense = void 0;
|
|
16
16
|
exports.init = init;
|
|
17
17
|
exports.initInternal = initInternal;
|
|
18
18
|
const types_1 = require("@budibase/types");
|
|
@@ -108,6 +108,10 @@ const usePkceOidc = () => {
|
|
|
108
108
|
return useFeature(types_1.Feature.PKCE_OIDC);
|
|
109
109
|
};
|
|
110
110
|
exports.usePkceOidc = usePkceOidc;
|
|
111
|
+
const useTranslations = () => {
|
|
112
|
+
return useFeature(types_1.Feature.TRANSLATIONS);
|
|
113
|
+
};
|
|
114
|
+
exports.useTranslations = useTranslations;
|
|
111
115
|
const useBudibaseAI = (opts) => {
|
|
112
116
|
return useFeature(types_1.Feature.BUDIBASE_AI, {
|
|
113
117
|
monthlyQuotas: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/licenses.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/licenses.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const utils_1 = require("../../src/redis/utils");
|
|
13
|
+
const environment_1 = require("../../src/environment");
|
|
14
|
+
describe("redis utils", () => {
|
|
15
|
+
describe("getRedisConnectionDetails", () => {
|
|
16
|
+
it("reads username and password from URL", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
const details = yield (0, environment_1.withEnv)({
|
|
18
|
+
REDIS_URL: "redis://alice:secret@localhost:6380",
|
|
19
|
+
REDIS_USERNAME: "",
|
|
20
|
+
REDIS_PASSWORD: "",
|
|
21
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisConnectionDetails)(); }));
|
|
22
|
+
expect(details).toEqual({
|
|
23
|
+
host: "localhost",
|
|
24
|
+
password: "secret",
|
|
25
|
+
username: "alice",
|
|
26
|
+
port: 6380,
|
|
27
|
+
});
|
|
28
|
+
}));
|
|
29
|
+
it("supports password-only URL without username", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
|
+
const details = yield (0, environment_1.withEnv)({
|
|
31
|
+
REDIS_URL: "redis://:secret@localhost:6380",
|
|
32
|
+
REDIS_USERNAME: "",
|
|
33
|
+
REDIS_PASSWORD: "",
|
|
34
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisConnectionDetails)(); }));
|
|
35
|
+
expect(details.username).toBeUndefined();
|
|
36
|
+
expect(details.password).toBe("secret");
|
|
37
|
+
expect(details.host).toBe("localhost");
|
|
38
|
+
expect(details.port).toBe(6380);
|
|
39
|
+
}));
|
|
40
|
+
it("prefers env username over URL username", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
|
+
const details = yield (0, environment_1.withEnv)({
|
|
42
|
+
REDIS_URL: "redis://urluser:secret@localhost:6380",
|
|
43
|
+
REDIS_USERNAME: "envuser",
|
|
44
|
+
REDIS_PASSWORD: "",
|
|
45
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisConnectionDetails)(); }));
|
|
46
|
+
expect(details.username).toBe("envuser");
|
|
47
|
+
expect(details.password).toBe("secret");
|
|
48
|
+
expect(details.host).toBe("localhost");
|
|
49
|
+
expect(details.port).toBe(6380);
|
|
50
|
+
}));
|
|
51
|
+
});
|
|
52
|
+
describe("getRedisOptions", () => {
|
|
53
|
+
it("omits username when not provided", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
54
|
+
const options = yield (0, environment_1.withEnv)({
|
|
55
|
+
REDIS_URL: "redis://:secret@localhost:6380",
|
|
56
|
+
REDIS_USERNAME: "",
|
|
57
|
+
REDIS_PASSWORD: "",
|
|
58
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisOptions)(); }));
|
|
59
|
+
expect(options.username).toBeUndefined();
|
|
60
|
+
expect(options.password).toBe("secret");
|
|
61
|
+
}));
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=utils.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../../../tests/redis/utils.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iDAG8B;AAC9B,uDAA+C;AAE/C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,sCAAsC,EAAE,GAAS,EAAE;YACpD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,qCAAqC;gBAChD,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBACtB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,IAAI;aACX,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;YAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,wCAAwC,EAAE,GAAS,EAAE;YACtD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,uCAAuC;gBAClD,cAAc,EAAE,SAAS;gBACzB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,kCAAkC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,uBAAe,GAAE,CAAA,GAAA,CAC9B,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.24.
|
|
3
|
+
"version": "3.24.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",
|
|
@@ -113,5 +113,5 @@
|
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
},
|
|
116
|
-
"gitHead": "
|
|
116
|
+
"gitHead": "6d1812ff9a22270318eaf1f61f4e9af51bbac383"
|
|
117
117
|
}
|