@budibase/backend-core 2.12.0 → 2.12.2
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 +29 -18
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +5 -5
- package/dist/plugins.js.map +1 -1
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/db/constants.d.ts +1 -0
- package/dist/src/db/constants.js +5 -1
- package/dist/src/db/constants.js.map +1 -1
- package/dist/src/docIds/params.d.ts +9 -11
- package/dist/src/docIds/params.js.map +1 -1
- package/dist/src/users/db.js +1 -5
- package/dist/src/users/db.js.map +1 -1
- package/dist/src/users/users.d.ts +5 -3
- package/dist/src/users/users.js +4 -3
- package/dist/src/users/users.js.map +1 -1
- package/dist/tests/core/utilities/mocks/date.js.map +1 -1
- package/package.json +5 -5
- package/src/db/constants.ts +4 -0
- package/src/docIds/params.ts +21 -8
- package/src/users/db.ts +1 -5
- package/src/users/users.ts +11 -6
- package/tests/core/utilities/mocks/date.ts +1 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ViewName } from "../constants";
|
|
2
|
+
import { DatabaseQueryOpts } from "@budibase/types";
|
|
2
3
|
/**
|
|
3
4
|
* If creating DB allDocs/query params with only a single top level ID this can be used, this
|
|
4
5
|
* is usually the case as most of our docs are top level e.g. tables, automations, users and so on.
|
|
@@ -11,7 +12,7 @@ import { ViewName } from "../constants";
|
|
|
11
12
|
* @param otherProps Add any other properties onto the request, e.g. include_docs.
|
|
12
13
|
* @returns Parameters which can then be used with an allDocs request.
|
|
13
14
|
*/
|
|
14
|
-
export declare function getDocParams(docType: string, docId?: string | null, otherProps?:
|
|
15
|
+
export declare function getDocParams(docType: string, docId?: string | null, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
15
16
|
/**
|
|
16
17
|
* Gets the DB allDocs/query params for retrieving a row.
|
|
17
18
|
* @param tableId The table in which the rows have been stored.
|
|
@@ -20,7 +21,7 @@ export declare function getDocParams(docType: string, docId?: string | null, oth
|
|
|
20
21
|
* @param otherProps Any other properties to add to the request.
|
|
21
22
|
* @returns Parameters which can then be used with an allDocs request.
|
|
22
23
|
*/
|
|
23
|
-
export declare function getRowParams(tableId?: string | null, rowId?: string | null, otherProps?:
|
|
24
|
+
export declare function getRowParams(tableId?: string | null, rowId?: string | null, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
24
25
|
/**
|
|
25
26
|
* Retrieve the correct index for a view based on default design DB.
|
|
26
27
|
*/
|
|
@@ -38,19 +39,16 @@ export declare const isDatasourceId: (id: string) => boolean | "";
|
|
|
38
39
|
/**
|
|
39
40
|
* Gets parameters for retrieving workspaces.
|
|
40
41
|
*/
|
|
41
|
-
export declare function getWorkspaceParams(id?: string, otherProps?:
|
|
42
|
-
startkey: string;
|
|
43
|
-
endkey: string;
|
|
44
|
-
};
|
|
42
|
+
export declare function getWorkspaceParams(id?: string, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
45
43
|
/**
|
|
46
44
|
* Gets parameters for retrieving users.
|
|
47
45
|
*/
|
|
48
|
-
export declare function getGlobalUserParams(globalId: any, otherProps?:
|
|
46
|
+
export declare function getGlobalUserParams(globalId: any, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
49
47
|
/**
|
|
50
48
|
* Gets parameters for retrieving users, this is a utility function for the getDocParams function.
|
|
51
49
|
*/
|
|
52
|
-
export declare function getUserMetadataParams(userId?: string | null, otherProps?:
|
|
53
|
-
export declare function getUsersByAppParams(appId: any, otherProps?:
|
|
50
|
+
export declare function getUserMetadataParams(userId?: string | null, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
51
|
+
export declare function getUsersByAppParams(appId: any, otherProps?: Partial<DatabaseQueryOpts>): DatabaseQueryOpts;
|
|
54
52
|
/**
|
|
55
53
|
* Gets parameters for retrieving templates. Owner ID must be specified, either global or a workspace level.
|
|
56
54
|
*/
|
|
@@ -61,9 +59,9 @@ export declare function getTemplateParams(ownerId: any, templateId: any, otherPr
|
|
|
61
59
|
/**
|
|
62
60
|
* Gets parameters for retrieving a role, this is a utility function for the getDocParams function.
|
|
63
61
|
*/
|
|
64
|
-
export declare function getRoleParams(roleId?: string | null, otherProps?: {}):
|
|
62
|
+
export declare function getRoleParams(roleId?: string | null, otherProps?: {}): DatabaseQueryOpts;
|
|
65
63
|
export declare function getStartEndKeyURL(baseKey: any, tenantId?: string): string;
|
|
66
64
|
/**
|
|
67
65
|
* Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
|
|
68
66
|
*/
|
|
69
|
-
export declare const getPluginParams: (pluginId?: string | null, otherProps?: {}) =>
|
|
67
|
+
export declare const getPluginParams: (pluginId?: string | null, otherProps?: {}) => DatabaseQueryOpts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../src/docIds/params.ts"],"names":[],"mappings":";;;AAAA,4CAMqB;AACrB,+CAA4C;
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../src/docIds/params.ts"],"names":[],"mappings":"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"}
|
package/dist/src/users/db.js
CHANGED
|
@@ -143,11 +143,7 @@ class UserDB {
|
|
|
143
143
|
}
|
|
144
144
|
static getUsersByAppAccess(opts) {
|
|
145
145
|
return __awaiter(this, void 0, void 0, function* () {
|
|
146
|
-
|
|
147
|
-
include_docs: true,
|
|
148
|
-
limit: opts.limit || 50,
|
|
149
|
-
};
|
|
150
|
-
let response = yield usersCore.searchGlobalUsersByAppAccess(opts.appId, params);
|
|
146
|
+
let response = yield usersCore.searchGlobalUsersByAppAccess(opts.appId, { limit: opts.limit || 50 });
|
|
151
147
|
return response;
|
|
152
148
|
});
|
|
153
149
|
}
|
package/dist/src/users/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,uDAAwC;AACxC,sDAAuC;AACvC,wDAAyC;AACzC,gDAAiC;AACjC,wCAAkE;AAClE,+CAAgC;AAChC,sCAA4D;AAC5D,sDAAuC;AACvC,+DAAgD;AAChD,mDAAoC;AACpC,2CAYwB;AACxB,mCAKgB;AAChB,qCAA+C;AAC/C,oCAA+B;AAmB/B,MAAM,oBAAoB,GAAG,CAAO,MAAY,EAAE,EAAE;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAa,CAAA;IACnC,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IACvC,MAAM,YAAY,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;IACvC,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;AACxE,CAAC,CAAA,CAAA;AAED,MAAa,MAAM;IAKjB,MAAM,CAAC,IAAI,CAAC,QAAkB,EAAE,QAAkB,EAAE,UAAsB;QACxE,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAA;QACxB,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAA;QACxB,MAAM,CAAC,QAAQ,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,MAAM,CAAO,wBAAwB,CAAC,IAAU,EAAE,OAAiB;;YACjE,kEAAkE;YAClE,yDAAyD;YACzD,IAAI,qBAAG,CAAC,2BAA2B,IAAI,IAAA,eAAO,EAAC,IAAI,CAAC,EAAE;gBACpD,OAAO,KAAK,CAAA;aACb;YAED,gCAAgC;YAChC,IAAI,MAAM,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE;gBACzC,OAAO,IAAI,CAAA;aACZ;YAED,kBAAkB;YAClB,IAAI,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE;gBACnB,OAAO,IAAI,CAAA;aACZ;YAED,oBAAoB;YACpB,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAA;aAC/D;YACD,OAAO,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC,CAAA;QAC7E,CAAC;KAAA;IAED,MAAM,CAAO,SAAS,CACpB,IAAU,EACV,OAAqB;QACnB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,IAAI;KACtB,EACD,QAAgB,EAChB,MAAY,EACZ,OAAiB;;YAEjB,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;YAE5B,mEAAmE;YACnE,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC9B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;aAC7B;YAED,IAAI,cAAc,CAAA;YAClB,IAAI,QAAQ,EAAE;gBACZ,IAAI,MAAM,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;oBACxD,MAAM,IAAI,kBAAS,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAA;iBACtE;gBACD,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,IAAA,YAAI,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;aACrE;iBAAM,IAAI,MAAM,EAAE;gBACjB,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAA;aACjC;YAED,kDAAkD;YAClD,MAAM,gBAAgB,GACpB,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAA;YAClE,IAAI,CAAC,cAAc,IAAI,gBAAgB,EAAE;gBACvC,MAAM,6BAA6B,CAAA;aACpC;YAED,GAAG,GAAG,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAA;YAE3C,MAAM,QAAQ,+CACZ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,IAClB,MAAM,GACN,IAAI,KACP,GAAG,EACH,QAAQ,EAAE,cAAc,EACxB,QAAQ,GACT,CAAA;YACD,+CAA+C;YAC/C,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;gBACnB,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAA;aACpB;YACD,uDAAuD;YACvD,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,EAAE;gBAC3B,QAAQ,CAAC,MAAM,GAAG,kBAAU,CAAC,MAAM,CAAA;aACpC;YAED,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAED,MAAM,CAAO,QAAQ;;YACnB,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;YACxB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,OAAO,CAC/B,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE;gBAChC,YAAY,EAAE,IAAI;aACnB,CAAC,CACH,CAAA;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACjD,CAAC;KAAA;IAED,MAAM,CAAO,eAAe,CAAC,KAAa;;YACxC,IAAI,QAAQ,GAAQ,MAAM,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YACrE,OAAO;gBACL,SAAS,EAAE,QAAQ,CAAC,MAAM;aAC3B,CAAA;QACH,CAAC;KAAA;IAED,MAAM,CAAO,mBAAmB,CAAC,IAAwC;;YACvE,IAAI,QAAQ,GAAW,MAAM,SAAS,CAAC,4BAA4B,CACjE,IAAI,CAAC,KAAK,EACV,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAC5B,CAAA;YACD,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAED,MAAM,CAAO,cAAc,CAAC,KAAa;;YACvC,OAAO,SAAS,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC9C,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAO,OAAO,CAAC,MAAc;;YACjC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC5C,IAAI,IAAI,EAAE;gBACR,OAAO,IAAI,CAAC,QAAQ,CAAA;aACrB;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAiB;;YACpC,OAAO,MAAM,SAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;KAAA;IAED,MAAM,CAAO,UAAU,CAAC,KAAa;;YACnC,OAAO,MAAM,SAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAA;QACrD,CAAC;KAAA;IAED,MAAM,CAAO,IAAI,CAAC,IAAU,EAAE,OAAqB,EAAE;;;YACnD,2BAA2B;YAC3B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;gBAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;aACzB;YACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;gBAChC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;aAC5B;YACD,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;YAC9B,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;YAExB,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;YAEjD,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;aAC5C;YAED,IACE,CAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,0CAAE,MAAM;gBAC1B,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,EAC/C;gBACA,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;aACvE;YAED,IAAI,MAAwB,CAAA;YAC5B,IAAI,GAAG,EAAE;gBACP,mCAAmC;gBACnC,IAAI;oBACF,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAS,CAAA;oBACpC,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,EAAE;wBACnC,MAAM,iCAAiC,CAAA;qBACxC;oBACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;iBACrB;gBAAC,OAAO,CAAM,EAAE;oBACf,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE;wBACpB,+EAA+E;qBAChF;yBAAM;wBACL,MAAM,CAAC,CAAA;qBACR;iBACF;aACF;YAED,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE;gBACpB,gDAAgD;gBAChD,MAAM,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;gBACpD,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG,EAAE;oBAChC,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAA;iBACvC;aACF;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,sCAAsC;YACpE,MAAM,cAAc,GAAG,IAAA,iBAAS,EAAC,MAAM,CAAC,KAAK,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACpE,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,GAAS,EAAE;gBAC/D,MAAM,IAAA,0BAAkB,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;gBAEzC,IAAI,SAAS,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;gBACpE,mDAAmD;gBACnD,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAA,EAAE;oBAC5D,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAS,CAAA;iBACnE;gBAED,IAAI,CAAC,MAAM,KAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,EAAE;oBAC5B,SAAS,CAAC,KAAK,qBAAQ,KAAK,CAAE,CAAA;iBAC/B;gBAED,gDAAgD;gBAChD,yDAAyD;gBACzD,IAAI,aAAa,GAAG,EAAE,CAAA;gBACtB,IAAI,CAAC,GAAG,EAAE;oBACR,GAAG,GAAG,SAAS,CAAC,GAAI,CAAA;oBAEpB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzB,KAAK,IAAI,OAAO,IAAI,UAAU,EAAE;4BAC9B,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAA;yBAC5D;qBACF;iBACF;gBAED,IAAI;oBACF,sBAAsB;oBACtB,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBACtC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAA;oBAE7B,MAAM,YAAY,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;oBACtD,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAC1B,QAAQ,EACR,SAAS,CAAC,GAAI,EACd,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,KAAK,CAChB,CAAA;oBACD,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;oBAE5C,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;oBAEhC,8CAA8C;oBAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAI,CAAC,CAAA;iBAC9B;gBAAC,OAAO,GAAQ,EAAE;oBACjB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;wBACtB,MAAM,qBAAqB,CAAA;qBAC5B;yBAAM;wBACL,MAAM,GAAG,CAAA;qBACV;iBACF;YACH,CAAC,CAAA,CAAC,CAAA;;KACH;IAED,MAAM,CAAO,UAAU,CACrB,iBAAyB,EACzB,MAAgB;;YAEhB,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;YAE9B,IAAI,WAAW,GAAU,EAAE,CAAA;YAC3B,IAAI,QAAQ,GAAU,EAAE,CAAA;YACxB,IAAI,WAAW,GAAU,EAAE,CAAA;YAE3B,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAChE,MAAM,cAAc,GAAG,MAAM,IAAA,6BAAoB,EAAC,MAAM,CAAC,CAAA;YACzD,MAAM,YAAY,GAAwC,EAAE,CAAA;YAE5D,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;gBACvC,IACE,QAAQ,CAAC,IAAI,CACX,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CACnE;oBACD,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,EACpD;oBACA,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,MAAM,EAAE,aAAa;qBACtB,CAAC,CAAA;oBACF,SAAQ;iBACT;gBACD,OAAO,CAAC,UAAU,GAAG,MAAM,CAAA;gBAC3B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACtB,IAAI,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAE;oBACtB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC1B;aACF;YAED,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAA;YAC/D,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAC3B,QAAQ,CAAC,MAAM,EACf,WAAW,CAAC,MAAM,EAClB,GAAS,EAAE;gBACT,4DAA4D;gBAC5D,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;oBAC7B,WAAW,CAAC,IAAI,CACd,MAAM,CAAC,SAAS,CACd,IAAI,EACJ;wBACE,YAAY,EAAE,IAAI;wBAClB,eAAe,EAAE,IAAI,CAAC,eAAe;qBACtC,EACD,QAAQ,EACR,SAAS,EAAE,YAAY;oBACvB,OAAO,CACR,CACF,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;gBACtD,MAAM,SAAS,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAA;gBAEtD,wEAAwE;gBACxE,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;oBAClC,uDAAuD;oBACvD,gDAAgD;oBAChD,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;oBAC5D,MAAM,YAAY,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;iBACrD;gBAED,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACvC,OAAO;wBACL,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,KAAK,EAAE,IAAI,CAAC,KAAK;qBAClB,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,wBAAwB;gBACxB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,EAAE;oBAClC,MAAM,aAAa,GAAG,EAAE,CAAA;oBACxB,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBAClD,KAAK,IAAI,OAAO,IAAI,MAAM,EAAE;wBAC1B,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;qBACpE;oBACD,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;iBACjC;gBAED,OAAO;oBACL,UAAU,EAAE,KAAK;oBACjB,YAAY;iBACb,CAAA;YACH,CAAC,CAAA,CACF,CAAA;QACH,CAAC;KAAA;IAED,MAAM,CAAO,UAAU,CAAC,OAAiB;;YACvC,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;YAExB,MAAM,QAAQ,GAAoB;gBAChC,UAAU,EAAE,EAAE;gBACd,YAAY,EAAE,EAAE;aACjB,CAAA;YAED,+DAA+D;YAC/D,MAAM,OAAO,GAAG,MAAM,IAAA,mCAA2B,EAAC,OAAO,CAAC,CAAA;YAC1D,IAAI,OAAO,EAAE;gBACX,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;gBAC3D,4BAA4B;gBAC5B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;oBACzB,GAAG,EAAE,OAAO,CAAC,cAAc;oBAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,MAAM,EAAE,kCAAkC;iBAC3C,CAAC,CAAA;aACH;YAED,uBAAuB;YACvB,MAAM,eAAe,GAA0B,MAAM,EAAE,CAAC,OAAO,CAAC;gBAC9D,YAAY,EAAE,IAAI;gBAClB,IAAI,EAAE,OAAO;aACd,CAAC,CAAA;YACF,MAAM,aAAa,GAAW,eAAe,CAAC,IAAI,CAAC,GAAG,CACpD,CAAC,IAAuB,EAAE,EAAE;gBAC1B,OAAO,IAAI,CAAC,GAAG,CAAA;YACjB,CAAC,CACF,CAAA;YAED,iBAAiB;YACjB,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCACtC,IAAI,KACP,QAAQ,EAAE,IAAI,IACd,CAAC,CAAA;YACH,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAClE,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,iBAAS,CAAC,CAAA;YAExD,KAAK,IAAI,IAAI,IAAI,aAAa,EAAE;gBAC9B,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAA;aACjC;YACD,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;YAEzE,iBAAiB;YACjB,oBAAoB;YACpB,MAAM,SAAS,GAA4B,EAAE,CAAA;YAC7C,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBACrC,IAAI,CAAC,OAAO,CAAC,GAAI,CAAC,GAAG,OAAO,CAAA;gBAC5B,OAAO,IAAI,CAAA;YACb,CAAC,EAAE,SAAS,CAAC,CAAA;YAEb,wDAAwD;YACxD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxB,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAA;gBACtC,IAAI,IAAI,CAAC,EAAE,EAAE;oBACX,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;iBAClD;qBAAM;oBACL,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;wBACzB,GAAG,EAAE,IAAI,CAAC,EAAE;wBACZ,KAAK;wBACL,MAAM,EAAE,gBAAgB;qBACzB,CAAC,CAAA;iBACH;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,EAAU;;YAC7B,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;YACxB,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAS,CAAA;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAa,CAAA;YAEnC,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;gBACnD,4DAA4D;gBAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;gBAC1B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;gBAChD,IAAI,OAAO,EAAE;oBACX,IAAI,MAAM,CAAC,MAAM,KAAK,IAAA,qBAAW,GAAG,CAAC,GAAG,EAAE;wBACxC,MAAM,IAAI,kBAAS,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;qBACvE;yBAAM;wBACL,MAAM,IAAI,kBAAS,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAA;qBAC7D;iBACF;aACF;YAED,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YAEvC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;YAEpC,MAAM,gBAAgB,GAAG,IAAA,iBAAS,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAClD,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAA;YACpD,MAAM,YAAY,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;YAC7C,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;YACvC,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;QACnE,CAAC;KAAA;IAED,MAAM,CAAO,SAAS,CAAC,QAAkB;;YACvC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC5C,CAAC;KAAA;IAED,MAAM,CAAO,qBAAqB,CAAC,IAAU;;YAC3C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QACtD,CAAC;KAAA;CACF;AAzbD,wBAybC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BulkDocsResponse, SearchQuery, SearchUsersRequest, User, ContextUser } from "@budibase/types";
|
|
1
|
+
import { BulkDocsResponse, SearchQuery, SearchUsersRequest, User, ContextUser, DatabaseQueryOpts } from "@budibase/types";
|
|
2
2
|
type GetOpts = {
|
|
3
3
|
cleanup?: boolean;
|
|
4
4
|
};
|
|
@@ -12,8 +12,10 @@ export declare function getById(id: string, opts?: GetOpts): Promise<User>;
|
|
|
12
12
|
* all the users to find one with this email address.
|
|
13
13
|
*/
|
|
14
14
|
export declare const getGlobalUserByEmail: (email: String, opts?: GetOpts) => Promise<User | undefined>;
|
|
15
|
-
export declare const searchGlobalUsersByApp: (appId: any, opts:
|
|
16
|
-
export declare const searchGlobalUsersByAppAccess: (appId: any, opts
|
|
15
|
+
export declare const searchGlobalUsersByApp: (appId: any, opts: DatabaseQueryOpts, getOpts?: GetOpts) => Promise<User[]>;
|
|
16
|
+
export declare const searchGlobalUsersByAppAccess: (appId: any, opts?: {
|
|
17
|
+
limit?: number;
|
|
18
|
+
}) => Promise<any>;
|
|
17
19
|
export declare const getGlobalUserByAppPage: (appId: string, user: User) => string | undefined;
|
|
18
20
|
/**
|
|
19
21
|
* Performs a starts with search on the global email view.
|
package/dist/src/users/users.js
CHANGED
|
@@ -187,7 +187,7 @@ const searchGlobalUsersByAppAccess = (appId, opts) => __awaiter(void 0, void 0,
|
|
|
187
187
|
limit: (opts === null || opts === void 0 ? void 0 : opts.limit) || 50,
|
|
188
188
|
};
|
|
189
189
|
const resp = yield (0, db_1.directCouchFind)(context.getGlobalDBName(), searchOptions);
|
|
190
|
-
return resp
|
|
190
|
+
return resp.rows;
|
|
191
191
|
});
|
|
192
192
|
exports.searchGlobalUsersByAppAccess = searchGlobalUsersByAppAccess;
|
|
193
193
|
const getGlobalUserByAppPage = (appId, user) => {
|
|
@@ -222,7 +222,8 @@ const PAGE_LIMIT = 8;
|
|
|
222
222
|
const paginatedUsers = ({ bookmark, query, appId, limit, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
223
223
|
var _a, _b, _c;
|
|
224
224
|
const db = (0, context_1.getGlobalDB)();
|
|
225
|
-
const
|
|
225
|
+
const pageSize = limit !== null && limit !== void 0 ? limit : PAGE_LIMIT;
|
|
226
|
+
const pageLimit = pageSize + 1;
|
|
226
227
|
// get one extra document, to have the next page
|
|
227
228
|
const opts = {
|
|
228
229
|
include_docs: true,
|
|
@@ -250,7 +251,7 @@ const paginatedUsers = ({ bookmark, query, appId, limit, } = {}) => __awaiter(vo
|
|
|
250
251
|
const response = yield db.allDocs((0, db_1.getGlobalUserParams)(null, opts));
|
|
251
252
|
userList = response.rows.map((row) => row.doc);
|
|
252
253
|
}
|
|
253
|
-
return (0, db_1.pagination)(userList,
|
|
254
|
+
return (0, db_1.pagination)(userList, pageSize, {
|
|
254
255
|
paginate: true,
|
|
255
256
|
property,
|
|
256
257
|
getKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAac;AACd,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/date.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/date.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAA;AAEhD,QAAA,mBAAmB,GAAG,aAAa,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.2",
|
|
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",
|
|
@@ -21,10 +21,10 @@
|
|
|
21
21
|
"test:watch": "jest --watchAll"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@budibase/nano": "10.1.
|
|
24
|
+
"@budibase/nano": "10.1.3",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.12.
|
|
27
|
-
"@budibase/types": "2.12.
|
|
26
|
+
"@budibase/shared-core": "2.12.2",
|
|
27
|
+
"@budibase/types": "2.12.2",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.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": "e06d0116f35e623ed44b974fc1540d5c3fd39914"
|
|
100
100
|
}
|
package/src/db/constants.ts
CHANGED
|
@@ -8,3 +8,7 @@ export const CONSTANT_INTERNAL_ROW_COLS = [
|
|
|
8
8
|
] as const
|
|
9
9
|
|
|
10
10
|
export const CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"] as const
|
|
11
|
+
|
|
12
|
+
export function isInternalColumnName(name: string): boolean {
|
|
13
|
+
return (CONSTANT_INTERNAL_ROW_COLS as readonly string[]).includes(name)
|
|
14
|
+
}
|
package/src/docIds/params.ts
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
ViewName,
|
|
7
7
|
} from "../constants"
|
|
8
8
|
import { getProdAppID } from "./conversions"
|
|
9
|
+
import { DatabaseQueryOpts } from "@budibase/types"
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* If creating DB allDocs/query params with only a single top level ID this can be used, this
|
|
@@ -22,8 +23,8 @@ import { getProdAppID } from "./conversions"
|
|
|
22
23
|
export function getDocParams(
|
|
23
24
|
docType: string,
|
|
24
25
|
docId?: string | null,
|
|
25
|
-
otherProps:
|
|
26
|
-
) {
|
|
26
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
27
|
+
): DatabaseQueryOpts {
|
|
27
28
|
if (docId == null) {
|
|
28
29
|
docId = ""
|
|
29
30
|
}
|
|
@@ -45,8 +46,8 @@ export function getDocParams(
|
|
|
45
46
|
export function getRowParams(
|
|
46
47
|
tableId?: string | null,
|
|
47
48
|
rowId?: string | null,
|
|
48
|
-
otherProps = {}
|
|
49
|
-
) {
|
|
49
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
50
|
+
): DatabaseQueryOpts {
|
|
50
51
|
if (tableId == null) {
|
|
51
52
|
return getDocParams(DocumentType.ROW, null, otherProps)
|
|
52
53
|
}
|
|
@@ -88,7 +89,10 @@ export const isDatasourceId = (id: string) => {
|
|
|
88
89
|
/**
|
|
89
90
|
* Gets parameters for retrieving workspaces.
|
|
90
91
|
*/
|
|
91
|
-
export function getWorkspaceParams(
|
|
92
|
+
export function getWorkspaceParams(
|
|
93
|
+
id = "",
|
|
94
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
95
|
+
): DatabaseQueryOpts {
|
|
92
96
|
return {
|
|
93
97
|
...otherProps,
|
|
94
98
|
startkey: `${DocumentType.WORKSPACE}${SEPARATOR}${id}`,
|
|
@@ -99,7 +103,10 @@ export function getWorkspaceParams(id = "", otherProps = {}) {
|
|
|
99
103
|
/**
|
|
100
104
|
* Gets parameters for retrieving users.
|
|
101
105
|
*/
|
|
102
|
-
export function getGlobalUserParams(
|
|
106
|
+
export function getGlobalUserParams(
|
|
107
|
+
globalId: any,
|
|
108
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
109
|
+
): DatabaseQueryOpts {
|
|
103
110
|
if (!globalId) {
|
|
104
111
|
globalId = ""
|
|
105
112
|
}
|
|
@@ -117,11 +124,17 @@ export function getGlobalUserParams(globalId: any, otherProps: any = {}) {
|
|
|
117
124
|
/**
|
|
118
125
|
* Gets parameters for retrieving users, this is a utility function for the getDocParams function.
|
|
119
126
|
*/
|
|
120
|
-
export function getUserMetadataParams(
|
|
127
|
+
export function getUserMetadataParams(
|
|
128
|
+
userId?: string | null,
|
|
129
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
130
|
+
): DatabaseQueryOpts {
|
|
121
131
|
return getRowParams(InternalTable.USER_METADATA, userId, otherProps)
|
|
122
132
|
}
|
|
123
133
|
|
|
124
|
-
export function getUsersByAppParams(
|
|
134
|
+
export function getUsersByAppParams(
|
|
135
|
+
appId: any,
|
|
136
|
+
otherProps: Partial<DatabaseQueryOpts> = {}
|
|
137
|
+
): DatabaseQueryOpts {
|
|
125
138
|
const prodAppId = getProdAppID(appId)
|
|
126
139
|
return {
|
|
127
140
|
...otherProps,
|
package/src/users/db.ts
CHANGED
|
@@ -165,13 +165,9 @@ export class UserDB {
|
|
|
165
165
|
}
|
|
166
166
|
|
|
167
167
|
static async getUsersByAppAccess(opts: { appId?: string; limit?: number }) {
|
|
168
|
-
const params: any = {
|
|
169
|
-
include_docs: true,
|
|
170
|
-
limit: opts.limit || 50,
|
|
171
|
-
}
|
|
172
168
|
let response: User[] = await usersCore.searchGlobalUsersByAppAccess(
|
|
173
169
|
opts.appId,
|
|
174
|
-
|
|
170
|
+
{ limit: opts.limit || 50 }
|
|
175
171
|
)
|
|
176
172
|
return response
|
|
177
173
|
}
|
package/src/users/users.ts
CHANGED
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
User,
|
|
21
21
|
ContextUser,
|
|
22
22
|
DatabaseQueryOpts,
|
|
23
|
+
CouchFindOptions,
|
|
23
24
|
} from "@budibase/types"
|
|
24
25
|
import { getGlobalDB } from "../context"
|
|
25
26
|
import * as context from "../context"
|
|
@@ -140,7 +141,7 @@ export const getGlobalUserByEmail = async (
|
|
|
140
141
|
|
|
141
142
|
export const searchGlobalUsersByApp = async (
|
|
142
143
|
appId: any,
|
|
143
|
-
opts:
|
|
144
|
+
opts: DatabaseQueryOpts,
|
|
144
145
|
getOpts?: GetOpts
|
|
145
146
|
) => {
|
|
146
147
|
if (typeof appId !== "string") {
|
|
@@ -166,7 +167,10 @@ export const searchGlobalUsersByApp = async (
|
|
|
166
167
|
Return any user who potentially has access to the application
|
|
167
168
|
Admins, developers and app users with the explicitly role.
|
|
168
169
|
*/
|
|
169
|
-
export const searchGlobalUsersByAppAccess = async (
|
|
170
|
+
export const searchGlobalUsersByAppAccess = async (
|
|
171
|
+
appId: any,
|
|
172
|
+
opts?: { limit?: number }
|
|
173
|
+
) => {
|
|
170
174
|
const roleSelector = `roles.${appId}`
|
|
171
175
|
|
|
172
176
|
let orQuery: any[] = [
|
|
@@ -187,7 +191,7 @@ export const searchGlobalUsersByAppAccess = async (appId: any, opts: any) => {
|
|
|
187
191
|
orQuery.push(roleCheck)
|
|
188
192
|
}
|
|
189
193
|
|
|
190
|
-
let searchOptions = {
|
|
194
|
+
let searchOptions: CouchFindOptions = {
|
|
191
195
|
selector: {
|
|
192
196
|
$or: orQuery,
|
|
193
197
|
_id: {
|
|
@@ -198,7 +202,7 @@ export const searchGlobalUsersByAppAccess = async (appId: any, opts: any) => {
|
|
|
198
202
|
}
|
|
199
203
|
|
|
200
204
|
const resp = await directCouchFind(context.getGlobalDBName(), searchOptions)
|
|
201
|
-
return resp
|
|
205
|
+
return resp.rows
|
|
202
206
|
}
|
|
203
207
|
|
|
204
208
|
export const getGlobalUserByAppPage = (appId: string, user: User) => {
|
|
@@ -245,7 +249,8 @@ export const paginatedUsers = async ({
|
|
|
245
249
|
limit,
|
|
246
250
|
}: SearchUsersRequest = {}) => {
|
|
247
251
|
const db = getGlobalDB()
|
|
248
|
-
const
|
|
252
|
+
const pageSize = limit ?? PAGE_LIMIT
|
|
253
|
+
const pageLimit = pageSize + 1
|
|
249
254
|
// get one extra document, to have the next page
|
|
250
255
|
const opts: DatabaseQueryOpts = {
|
|
251
256
|
include_docs: true,
|
|
@@ -272,7 +277,7 @@ export const paginatedUsers = async ({
|
|
|
272
277
|
const response = await db.allDocs(getGlobalUserParams(null, opts))
|
|
273
278
|
userList = response.rows.map((row: any) => row.doc)
|
|
274
279
|
}
|
|
275
|
-
return pagination(userList,
|
|
280
|
+
return pagination(userList, pageSize, {
|
|
276
281
|
paginate: true,
|
|
277
282
|
property,
|
|
278
283
|
getKey,
|