@budibase/backend-core 2.29.15 → 2.29.17
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 +104 -62
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/db/couch/connections.js +5 -1
- package/dist/src/db/couch/connections.js.map +1 -1
- package/dist/src/db/utils.d.ts +1 -0
- package/dist/src/db/utils.js +19 -0
- package/dist/src/db/utils.js.map +1 -1
- package/dist/src/environment.d.ts +3 -1
- package/dist/src/environment.js +2 -1
- package/dist/src/environment.js.map +1 -1
- package/dist/src/users/users.js +3 -3
- package/dist/src/users/users.js.map +1 -1
- package/package.json +4 -4
- package/src/db/couch/connections.ts +4 -1
- package/src/db/utils.ts +26 -0
- package/src/environment.ts +4 -1
- package/src/users/users.ts +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.29.
|
|
3
|
+
"version": "2.29.17",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.11",
|
|
26
|
-
"@budibase/shared-core": "2.29.
|
|
27
|
-
"@budibase/types": "2.29.
|
|
26
|
+
"@budibase/shared-core": "2.29.17",
|
|
27
|
+
"@budibase/types": "2.29.17",
|
|
28
28
|
"aws-cloudfront-sign": "3.0.2",
|
|
29
29
|
"aws-sdk": "2.1030.0",
|
|
30
30
|
"bcrypt": "5.1.0",
|
|
@@ -95,5 +95,5 @@
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "9937f16cdae5282ca44496f691acd4f0bcdefd90"
|
|
99
99
|
}
|
|
@@ -25,7 +25,10 @@ export const getCouchInfo = (connection?: string) => {
|
|
|
25
25
|
}
|
|
26
26
|
const authCookie = Buffer.from(`${username}:${password}`).toString("base64")
|
|
27
27
|
let sqlUrl = env.COUCH_DB_SQL_URL
|
|
28
|
-
|
|
28
|
+
// default for dev
|
|
29
|
+
if (env.isDev() && !sqlUrl) {
|
|
30
|
+
sqlUrl = "http://localhost:4006"
|
|
31
|
+
} else if (!sqlUrl && urlInfo.url) {
|
|
29
32
|
const parsed = new URL(urlInfo.url)
|
|
30
33
|
// attempt to connect on default port
|
|
31
34
|
sqlUrl = urlInfo.url.replace(parsed.port, "4984")
|
package/src/db/utils.ts
CHANGED
|
@@ -206,3 +206,29 @@ export function pagination<T>(
|
|
|
206
206
|
nextPage,
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
|
+
|
|
210
|
+
export function isSqsEnabledForTenant(): boolean {
|
|
211
|
+
const tenantId = getTenantId()
|
|
212
|
+
if (!env.SQS_SEARCH_ENABLE) {
|
|
213
|
+
return false
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
// This is to guard against the situation in tests where tests pass because
|
|
217
|
+
// we're not actually using SQS, we're using Lucene and the tests pass due to
|
|
218
|
+
// parity.
|
|
219
|
+
if (env.isTest() && env.SQS_SEARCH_ENABLE_TENANTS.length === 0) {
|
|
220
|
+
throw new Error(
|
|
221
|
+
"to enable SQS you must specify a list of tenants in the SQS_SEARCH_ENABLE_TENANTS env var"
|
|
222
|
+
)
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
// Special case to enable all tenants, for testing in QA.
|
|
226
|
+
if (
|
|
227
|
+
env.SQS_SEARCH_ENABLE_TENANTS.length === 1 &&
|
|
228
|
+
env.SQS_SEARCH_ENABLE_TENANTS[0] === "*"
|
|
229
|
+
) {
|
|
230
|
+
return true
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
return env.SQS_SEARCH_ENABLE_TENANTS.includes(tenantId)
|
|
234
|
+
}
|
package/src/environment.ts
CHANGED
|
@@ -114,8 +114,11 @@ const environment = {
|
|
|
114
114
|
ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
|
|
115
115
|
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
|
|
116
116
|
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
|
|
117
|
-
COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL
|
|
117
|
+
COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL,
|
|
118
118
|
SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE,
|
|
119
|
+
SQS_SEARCH_ENABLE_TENANTS:
|
|
120
|
+
process.env.SQS_SEARCH_ENABLE_TENANTS?.split(",") || [],
|
|
121
|
+
SQS_MIGRATION_ENABLE: process.env.SQS_MIGRATION_ENABLE,
|
|
119
122
|
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
|
|
120
123
|
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
|
|
121
124
|
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
|
package/src/users/users.ts
CHANGED
|
@@ -18,9 +18,10 @@ import {
|
|
|
18
18
|
CouchFindOptions,
|
|
19
19
|
DatabaseQueryOpts,
|
|
20
20
|
SearchFilters,
|
|
21
|
-
SearchFilterOperator,
|
|
22
21
|
SearchUsersRequest,
|
|
23
22
|
User,
|
|
23
|
+
BasicOperator,
|
|
24
|
+
ArrayOperator,
|
|
24
25
|
} from "@budibase/types"
|
|
25
26
|
import * as context from "../context"
|
|
26
27
|
import { getGlobalDB } from "../context"
|
|
@@ -46,9 +47,9 @@ function removeUserPassword(users: User | User[]) {
|
|
|
46
47
|
|
|
47
48
|
export function isSupportedUserSearch(query: SearchFilters) {
|
|
48
49
|
const allowed = [
|
|
49
|
-
{ op:
|
|
50
|
-
{ op:
|
|
51
|
-
{ op:
|
|
50
|
+
{ op: BasicOperator.STRING, key: "email" },
|
|
51
|
+
{ op: BasicOperator.EQUAL, key: "_id" },
|
|
52
|
+
{ op: ArrayOperator.ONE_OF, key: "_id" },
|
|
52
53
|
]
|
|
53
54
|
for (let [key, operation] of Object.entries(query)) {
|
|
54
55
|
if (typeof operation !== "object") {
|