@budibase/backend-core 2.22.13 → 2.22.15
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 +6 -1
- package/dist/index.js.map +2 -2
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/src/users/users.d.ts +1 -1
- package/dist/src/users/users.js +8 -2
- package/dist/src/users/users.js.map +1 -1
- package/package.json +4 -4
- package/src/users/users.ts +9 -4
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.22.
|
|
3
|
+
"version": "2.22.15",
|
|
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.22.
|
|
27
|
-
"@budibase/types": "2.22.
|
|
26
|
+
"@budibase/shared-core": "2.22.15",
|
|
27
|
+
"@budibase/types": "2.22.15",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "5ec5e990b3e96a2720470158c4cc8cf10926b637"
|
|
100
100
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BulkDocsResponse,
|
|
1
|
+
import { BulkDocsResponse, ContextUser, DatabaseQueryOpts, SearchQuery, SearchUsersRequest, User } from "@budibase/types";
|
|
2
2
|
type GetOpts = {
|
|
3
3
|
cleanup?: boolean;
|
|
4
4
|
};
|
package/dist/src/users/users.js
CHANGED
|
@@ -35,8 +35,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
35
35
|
exports.removeAppBuilder = exports.addAppBuilder = exports.cleanseUserObject = exports.removePortalUserPermissions = exports.getCreatorCount = exports.getUserCount = exports.paginatedUsers = exports.searchGlobalUsersByEmail = exports.getGlobalUserByAppPage = exports.searchGlobalUsersByAppAccess = exports.searchGlobalUsersByApp = exports.doesUserExist = exports.getGlobalUserByEmail = exports.getById = exports.bulkUpdateGlobalUsers = exports.getAllUserIds = exports.bulkGetGlobalUsersById = exports.isSupportedUserSearch = void 0;
|
|
36
36
|
const db_1 = require("../db");
|
|
37
37
|
const types_1 = require("@budibase/types");
|
|
38
|
-
const context_1 = require("../context");
|
|
39
38
|
const context = __importStar(require("../context"));
|
|
39
|
+
const context_1 = require("../context");
|
|
40
40
|
const utils_1 = require("./utils");
|
|
41
41
|
const db_2 = require("./db");
|
|
42
42
|
function removeUserPassword(users) {
|
|
@@ -58,6 +58,7 @@ function isSupportedUserSearch(query) {
|
|
|
58
58
|
const allowed = [
|
|
59
59
|
{ op: types_1.SearchQueryOperators.STRING, key: "email" },
|
|
60
60
|
{ op: types_1.SearchQueryOperators.EQUAL, key: "_id" },
|
|
61
|
+
{ op: types_1.SearchQueryOperators.ONE_OF, key: "_id" },
|
|
61
62
|
];
|
|
62
63
|
for (let [key, operation] of Object.entries(query)) {
|
|
63
64
|
if (typeof operation !== "object") {
|
|
@@ -250,7 +251,7 @@ function searchGlobalUsersByEmail(email, opts, getOpts) {
|
|
|
250
251
|
exports.searchGlobalUsersByEmail = searchGlobalUsersByEmail;
|
|
251
252
|
const PAGE_LIMIT = 8;
|
|
252
253
|
function paginatedUsers({ bookmark, query, appId, limit, } = {}) {
|
|
253
|
-
var _a, _b, _c;
|
|
254
|
+
var _a, _b, _c, _d, _e;
|
|
254
255
|
return __awaiter(this, void 0, void 0, function* () {
|
|
255
256
|
const db = (0, context_1.getGlobalDB)();
|
|
256
257
|
const pageSize = limit !== null && limit !== void 0 ? limit : PAGE_LIMIT;
|
|
@@ -277,6 +278,11 @@ function paginatedUsers({ bookmark, query, appId, limit, } = {}) {
|
|
|
277
278
|
userList = yield searchGlobalUsersByEmail((_c = query === null || query === void 0 ? void 0 : query.string) === null || _c === void 0 ? void 0 : _c.email, opts);
|
|
278
279
|
property = "email";
|
|
279
280
|
}
|
|
281
|
+
else if ((_d = query === null || query === void 0 ? void 0 : query.oneOf) === null || _d === void 0 ? void 0 : _d._id) {
|
|
282
|
+
userList = yield bulkGetGlobalUsersById((_e = query === null || query === void 0 ? void 0 : query.oneOf) === null || _e === void 0 ? void 0 : _e._id, {
|
|
283
|
+
cleanup: true,
|
|
284
|
+
});
|
|
285
|
+
}
|
|
280
286
|
else {
|
|
281
287
|
// no search, query allDocs
|
|
282
288
|
const response = yield db.allDocs((0, db_1.getGlobalUserParams)(null, opts));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAac;AACd,2CASwB;AACxB,wCAAwC;AACxC,
|
|
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.22.
|
|
3
|
+
"version": "2.22.15",
|
|
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.22.
|
|
27
|
-
"@budibase/types": "2.22.
|
|
26
|
+
"@budibase/shared-core": "2.22.15",
|
|
27
|
+
"@budibase/types": "2.22.15",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "5ec5e990b3e96a2720470158c4cc8cf10926b637"
|
|
100
100
|
}
|
package/src/users/users.ts
CHANGED
|
@@ -14,16 +14,16 @@ import {
|
|
|
14
14
|
} from "../db"
|
|
15
15
|
import {
|
|
16
16
|
BulkDocsResponse,
|
|
17
|
+
ContextUser,
|
|
18
|
+
CouchFindOptions,
|
|
19
|
+
DatabaseQueryOpts,
|
|
17
20
|
SearchQuery,
|
|
18
21
|
SearchQueryOperators,
|
|
19
22
|
SearchUsersRequest,
|
|
20
23
|
User,
|
|
21
|
-
ContextUser,
|
|
22
|
-
DatabaseQueryOpts,
|
|
23
|
-
CouchFindOptions,
|
|
24
24
|
} from "@budibase/types"
|
|
25
|
-
import { getGlobalDB } from "../context"
|
|
26
25
|
import * as context from "../context"
|
|
26
|
+
import { getGlobalDB } from "../context"
|
|
27
27
|
import { isCreator } from "./utils"
|
|
28
28
|
import { UserDB } from "./db"
|
|
29
29
|
|
|
@@ -48,6 +48,7 @@ export function isSupportedUserSearch(query: SearchQuery) {
|
|
|
48
48
|
const allowed = [
|
|
49
49
|
{ op: SearchQueryOperators.STRING, key: "email" },
|
|
50
50
|
{ op: SearchQueryOperators.EQUAL, key: "_id" },
|
|
51
|
+
{ op: SearchQueryOperators.ONE_OF, key: "_id" },
|
|
51
52
|
]
|
|
52
53
|
for (let [key, operation] of Object.entries(query)) {
|
|
53
54
|
if (typeof operation !== "object") {
|
|
@@ -285,6 +286,10 @@ export async function paginatedUsers({
|
|
|
285
286
|
} else if (query?.string?.email) {
|
|
286
287
|
userList = await searchGlobalUsersByEmail(query?.string?.email, opts)
|
|
287
288
|
property = "email"
|
|
289
|
+
} else if (query?.oneOf?._id) {
|
|
290
|
+
userList = await bulkGetGlobalUsersById(query?.oneOf?._id, {
|
|
291
|
+
cleanup: true,
|
|
292
|
+
})
|
|
288
293
|
} else {
|
|
289
294
|
// no search, query allDocs
|
|
290
295
|
const response = await db.allDocs(getGlobalUserParams(null, opts))
|