@budibase/backend-core 2.11.42 → 2.11.43
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 +264 -227
- package/dist/index.js.map +3 -3
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/plugins.js.map +1 -1
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/environment.js +2 -2
- package/dist/src/environment.js.map +1 -1
- package/dist/src/users/users.d.ts +1 -0
- package/dist/src/users/users.js +20 -2
- package/dist/src/users/users.js.map +1 -1
- package/dist/src/users/utils.d.ts +1 -0
- package/dist/src/users/utils.js +2 -1
- package/dist/src/users/utils.js.map +1 -1
- package/dist/tests/core/utilities/structures/licenses.js +5 -0
- package/dist/tests/core/utilities/structures/licenses.js.map +1 -1
- package/dist/tests/core/utilities/structures/quotas.d.ts +1 -1
- package/dist/tests/core/utilities/structures/quotas.js +3 -2
- package/dist/tests/core/utilities/structures/quotas.js.map +1 -1
- package/package.json +4 -4
- package/src/environment.ts +2 -2
- package/src/users/users.ts +15 -1
- package/src/users/utils.ts +1 -0
- package/tests/core/utilities/structures/licenses.ts +5 -0
- package/tests/core/utilities/structures/quotas.ts +3 -2
package/dist/src/users/users.js
CHANGED
|
@@ -32,11 +32,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.cleanseUserObject = exports.removePortalUserPermissions = exports.getUserCount = exports.paginatedUsers = exports.searchGlobalUsersByEmail = exports.getGlobalUserByAppPage = exports.searchGlobalUsersByAppAccess = exports.searchGlobalUsersByApp = exports.getGlobalUserByEmail = exports.getById = exports.bulkUpdateGlobalUsers = exports.getAllUserIds = exports.bulkGetGlobalUsersById = exports.isSupportedUserSearch = void 0;
|
|
35
|
+
exports.cleanseUserObject = exports.removePortalUserPermissions = exports.getCreatorCount = exports.getUserCount = exports.paginatedUsers = exports.searchGlobalUsersByEmail = exports.getGlobalUserByAppPage = exports.searchGlobalUsersByAppAccess = exports.searchGlobalUsersByApp = 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 = __importStar(require("../context"));
|
|
39
38
|
const context_1 = require("../context");
|
|
39
|
+
const context = __importStar(require("../context"));
|
|
40
|
+
const utils_1 = require("./utils");
|
|
40
41
|
function removeUserPassword(users) {
|
|
41
42
|
if (Array.isArray(users)) {
|
|
42
43
|
return users.map(user => {
|
|
@@ -266,6 +267,23 @@ function getUserCount() {
|
|
|
266
267
|
});
|
|
267
268
|
}
|
|
268
269
|
exports.getUserCount = getUserCount;
|
|
270
|
+
function getCreatorCount() {
|
|
271
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
272
|
+
let creators = 0;
|
|
273
|
+
function iterate(startPage) {
|
|
274
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
275
|
+
const page = yield (0, exports.paginatedUsers)({ bookmark: startPage });
|
|
276
|
+
creators += page.data.filter(utils_1.isCreator).length;
|
|
277
|
+
if (page.hasNextPage) {
|
|
278
|
+
yield iterate(page.nextPage);
|
|
279
|
+
}
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
yield iterate();
|
|
283
|
+
return creators;
|
|
284
|
+
});
|
|
285
|
+
}
|
|
286
|
+
exports.getCreatorCount = getCreatorCount;
|
|
269
287
|
// used to remove the builder/admin permissions, for processing the
|
|
270
288
|
// user as an app user (they may have some specific role/group
|
|
271
289
|
function removePortalUserPermissions(user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAac;AACd,2CAQwB;AACxB,oDAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/users/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { CloudAccount } from "@budibase/types";
|
|
|
2
2
|
import { sdk } from "@budibase/shared-core";
|
|
3
3
|
export declare const isBuilder: typeof sdk.users.isBuilder;
|
|
4
4
|
export declare const isAdmin: typeof sdk.users.isAdmin;
|
|
5
|
+
export declare const isCreator: typeof sdk.users.isCreator;
|
|
5
6
|
export declare const isGlobalBuilder: typeof sdk.users.isGlobalBuilder;
|
|
6
7
|
export declare const isAdminOrBuilder: typeof sdk.users.isAdminOrBuilder;
|
|
7
8
|
export declare const hasAdminPermissions: typeof sdk.users.hasAdminPermissions;
|
package/dist/src/users/utils.js
CHANGED
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.getAccountHolderFromUserIds = exports.validateUniqueUser = exports.hasAppBuilderPermissions = exports.hasBuilderPermissions = exports.hasAdminPermissions = exports.isAdminOrBuilder = exports.isGlobalBuilder = exports.isAdmin = exports.isBuilder = void 0;
|
|
38
|
+
exports.getAccountHolderFromUserIds = exports.validateUniqueUser = exports.hasAppBuilderPermissions = exports.hasBuilderPermissions = exports.hasAdminPermissions = exports.isAdminOrBuilder = exports.isGlobalBuilder = exports.isCreator = exports.isAdmin = exports.isBuilder = void 0;
|
|
39
39
|
const accountSdk = __importStar(require("../accounts"));
|
|
40
40
|
const environment_1 = __importDefault(require("../environment"));
|
|
41
41
|
const lookup_1 = require("./lookup");
|
|
@@ -46,6 +46,7 @@ const accounts_1 = require("../accounts");
|
|
|
46
46
|
// extract from shared-core to make easily accessible from backend-core
|
|
47
47
|
exports.isBuilder = shared_core_1.sdk.users.isBuilder;
|
|
48
48
|
exports.isAdmin = shared_core_1.sdk.users.isAdmin;
|
|
49
|
+
exports.isCreator = shared_core_1.sdk.users.isCreator;
|
|
49
50
|
exports.isGlobalBuilder = shared_core_1.sdk.users.isGlobalBuilder;
|
|
50
51
|
exports.isAdminOrBuilder = shared_core_1.sdk.users.isAdminOrBuilder;
|
|
51
52
|
exports.hasAdminPermissions = shared_core_1.sdk.users.hasAdminPermissions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/users/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAAyC;AACzC,iEAAgC;AAChC,qCAA0C;AAC1C,sCAAiD;AACjD,wCAAwC;AACxC,uDAA2C;AAC3C,0CAAkD;AAElD,uEAAuE;AAC1D,QAAA,SAAS,GAAG,iBAAG,CAAC,KAAK,CAAC,SAAS,CAAA;AAC/B,QAAA,OAAO,GAAG,iBAAG,CAAC,KAAK,CAAC,OAAO,CAAA;AAC3B,QAAA,eAAe,GAAG,iBAAG,CAAC,KAAK,CAAC,eAAe,CAAA;AAC3C,QAAA,gBAAgB,GAAG,iBAAG,CAAC,KAAK,CAAC,gBAAgB,CAAA;AAC7C,QAAA,mBAAmB,GAAG,iBAAG,CAAC,KAAK,CAAC,mBAAmB,CAAA;AACnD,QAAA,qBAAqB,GAAG,iBAAG,CAAC,KAAK,CAAC,qBAAqB,CAAA;AACvD,QAAA,wBAAwB,GAAG,iBAAG,CAAC,KAAK,CAAC,wBAAwB,CAAA;AAE1E,SAAsB,kBAAkB,CAAC,KAAa,EAAE,QAAgB;;QACtE,wCAAwC;QACxC,IAAI,qBAAG,CAAC,aAAa,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAA;YAC/C,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBAC1D,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAA;aACvC;SACF;QAED,6CAA6C;QAC7C,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;YACnD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAClD,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBAChE,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAA;aACvC;SACF;IACH,CAAC;CAAA;AAhBD,gDAgBC;AAED;;GAEG;AACH,SAAsB,2BAA2B,CAC/C,OAAiB;;QAEjB,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;YACnD,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAoB,EAAC,QAAQ,CAAC,CAAA;YACpD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAA;aAC9D;YAED,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;YAC7C,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBACpC,OAAO,OAAO,CAAA;aACf;SACF;IACH,CAAC;CAAA;AAfD,kEAeC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/users/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAAyC;AACzC,iEAAgC;AAChC,qCAA0C;AAC1C,sCAAiD;AACjD,wCAAwC;AACxC,uDAA2C;AAC3C,0CAAkD;AAElD,uEAAuE;AAC1D,QAAA,SAAS,GAAG,iBAAG,CAAC,KAAK,CAAC,SAAS,CAAA;AAC/B,QAAA,OAAO,GAAG,iBAAG,CAAC,KAAK,CAAC,OAAO,CAAA;AAC3B,QAAA,SAAS,GAAG,iBAAG,CAAC,KAAK,CAAC,SAAS,CAAA;AAC/B,QAAA,eAAe,GAAG,iBAAG,CAAC,KAAK,CAAC,eAAe,CAAA;AAC3C,QAAA,gBAAgB,GAAG,iBAAG,CAAC,KAAK,CAAC,gBAAgB,CAAA;AAC7C,QAAA,mBAAmB,GAAG,iBAAG,CAAC,KAAK,CAAC,mBAAmB,CAAA;AACnD,QAAA,qBAAqB,GAAG,iBAAG,CAAC,KAAK,CAAC,qBAAqB,CAAA;AACvD,QAAA,wBAAwB,GAAG,iBAAG,CAAC,KAAK,CAAC,wBAAwB,CAAA;AAE1E,SAAsB,kBAAkB,CAAC,KAAa,EAAE,QAAgB;;QACtE,wCAAwC;QACxC,IAAI,qBAAG,CAAC,aAAa,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAA;YAC/C,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBAC1D,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAA;aACvC;SACF;QAED,6CAA6C;QAC7C,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;YACnD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAClD,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBAChE,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAA;aACvC;SACF;IACH,CAAC;CAAA;AAhBD,gDAgBC;AAED;;GAEG;AACH,SAAsB,2BAA2B,CAC/C,OAAiB;;QAEjB,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;YACnD,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAoB,EAAC,QAAQ,CAAC,CAAA;YACpD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAA;aAC9D;YAED,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;YAC7C,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBACpC,OAAO,OAAO,CAAA;aACf;SACF;IACH,CAAC;CAAA;AAfD,kEAeC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/licenses.ts"],"names":[],"mappings":";;;AAAA,2CAcwB;AACxB,2CAAuC;AAEvC,SAAgB,KAAK;IACnB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,KAAK;QACpB,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,qBAAa,CAAC,OAAO;QAC/B,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,SAAS;QACpB,SAAS,EAAE,IAAI;KAChB,CAAA;AACH,CAAC;AAVD,sBAUC;AAEM,MAAM,IAAI,GAAG,CAAC,OAAiB,gBAAQ,CAAC,IAAI,EAAiB,EAAE;IACpE,OAAO;QACL,IAAI;QACJ,aAAa,EAAE,KAAK;QACpB,KAAK,EAAE,iBAAS,CAAC,QAAQ;QACzB,KAAK,EAAE,IAAI,KAAK,gBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS;KACpD,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,IAAI,QAOhB;AAED,SAAgB,MAAM;IACpB,OAAO;QACL,KAAK,EAAE;YACL,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,WAAW,EAAE;oBACX,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;aACF;YACD,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,EAAE;iBACb;aACF;SACF;QACD,QAAQ,EAAE;YACR,0BAA0B,EAAE;gBAC1B,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,EAAE;aACb;YACD,sBAAsB,EAAE;gBACtB,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,EAAE;aACb;SACF;KACF,CAAA;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/licenses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { QuotaUsage } from "@budibase/types";
|
|
2
|
-
export declare const usage: () => QuotaUsage;
|
|
2
|
+
export declare const usage: (users?: number, creators?: number) => QuotaUsage;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.usage = void 0;
|
|
4
4
|
const types_1 = require("@budibase/types");
|
|
5
|
-
const usage = () => {
|
|
5
|
+
const usage = (users = 0, creators = 0) => {
|
|
6
6
|
return {
|
|
7
7
|
_id: "usage_quota",
|
|
8
8
|
quotaReset: new Date().toISOString(),
|
|
@@ -60,7 +60,8 @@ const usage = () => {
|
|
|
60
60
|
usageQuota: {
|
|
61
61
|
apps: 0,
|
|
62
62
|
plugins: 0,
|
|
63
|
-
users
|
|
63
|
+
users,
|
|
64
|
+
creators,
|
|
64
65
|
userGroups: 0,
|
|
65
66
|
rows: 0,
|
|
66
67
|
triggers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quotas.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/quotas.ts"],"names":[],"mappings":";;;AAAA,2CAA8D;AAEvD,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"quotas.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/quotas.ts"],"names":[],"mappings":";;;AAAA,2CAA8D;AAEvD,MAAM,KAAK,GAAG,CAAC,QAAgB,CAAC,EAAE,WAAmB,CAAC,EAAc,EAAE;IAC3E,OAAO;QACL,GAAG,EAAE,aAAa;QAClB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACpC,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,oEAAoE;gBACpE,UAAU,EAAE;oBACV,IAAI,EAAE,CAAC;iBACR;aACF;SACF;QACD,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE;oBACT,UAAU,EAAE;wBACV,MAAM,EAAE,wBAAgB,CAAC,OAAO;wBAChC,MAAM,EAAE;4BACN,KAAK,EAAE,CAAC;4BACR,KAAK,EAAE,CAAC;yBACT;qBACF;oBACD,iBAAiB,EAAE;wBACjB,MAAM,EAAE,wBAAgB,CAAC,OAAO;wBAChC,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC;4BACP,IAAI,EAAE,CAAC;yBACR;qBACF;oBACD,WAAW,EAAE;wBACX,MAAM,EAAE,wBAAgB,CAAC,WAAW;wBACpC,MAAM,EAAE;4BACN,MAAM,EAAE,CAAC;4BACT,MAAM,EAAE,CAAC;yBACV;qBACF;iBACF;aACF;YACD,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,EAAE;aACb;YACD,OAAO,EAAE;gBACP,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,EAAE;aACb;SACF;QACD,UAAU,EAAE;YACV,IAAI,EAAE,CAAC;YACP,OAAO,EAAE,CAAC;YACV,KAAK;YACL,QAAQ;YACR,UAAU,EAAE,CAAC;YACb,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACb;KACF,CAAA;AACH,CAAC,CAAA;AAjEY,QAAA,KAAK,SAiEjB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.11.
|
|
3
|
+
"version": "2.11.43",
|
|
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.2",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.11.
|
|
27
|
-
"@budibase/types": "2.11.
|
|
26
|
+
"@budibase/shared-core": "2.11.43",
|
|
27
|
+
"@budibase/types": "2.11.43",
|
|
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": "7f83c1b897398f29dbc5571ac039cff430a5db47"
|
|
100
100
|
}
|
package/src/environment.ts
CHANGED
|
@@ -75,12 +75,12 @@ function getPackageJsonFields(): {
|
|
|
75
75
|
const content = readFileSync(packageJsonFile!, "utf-8")
|
|
76
76
|
const parsedContent = JSON.parse(content)
|
|
77
77
|
return {
|
|
78
|
-
VERSION: parsedContent.version,
|
|
78
|
+
VERSION: process.env.BUDIBASE_VERSION || parsedContent.version,
|
|
79
79
|
SERVICE_NAME: parsedContent.name,
|
|
80
80
|
}
|
|
81
81
|
} catch {
|
|
82
82
|
// throwing an error here is confusing/causes backend-core to be hard to import
|
|
83
|
-
return { VERSION: "", SERVICE_NAME: "" }
|
|
83
|
+
return { VERSION: process.env.BUDIBASE_VERSION || "", SERVICE_NAME: "" }
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
|
package/src/users/users.ts
CHANGED
|
@@ -21,8 +21,9 @@ import {
|
|
|
21
21
|
User,
|
|
22
22
|
DatabaseQueryOpts,
|
|
23
23
|
} from "@budibase/types"
|
|
24
|
-
import * as context from "../context"
|
|
25
24
|
import { getGlobalDB } from "../context"
|
|
25
|
+
import * as context from "../context"
|
|
26
|
+
import { isCreator } from "./utils"
|
|
26
27
|
|
|
27
28
|
type GetOpts = { cleanup?: boolean }
|
|
28
29
|
|
|
@@ -286,6 +287,19 @@ export async function getUserCount() {
|
|
|
286
287
|
return response.total_rows
|
|
287
288
|
}
|
|
288
289
|
|
|
290
|
+
export async function getCreatorCount() {
|
|
291
|
+
let creators = 0
|
|
292
|
+
async function iterate(startPage?: string) {
|
|
293
|
+
const page = await paginatedUsers({ bookmark: startPage })
|
|
294
|
+
creators += page.data.filter(isCreator).length
|
|
295
|
+
if (page.hasNextPage) {
|
|
296
|
+
await iterate(page.nextPage)
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
await iterate()
|
|
300
|
+
return creators
|
|
301
|
+
}
|
|
302
|
+
|
|
289
303
|
// used to remove the builder/admin permissions, for processing the
|
|
290
304
|
// user as an app user (they may have some specific role/group
|
|
291
305
|
export function removePortalUserPermissions(user: User | ContextUser) {
|
package/src/users/utils.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { getAccountByTenantId } from "../accounts"
|
|
|
10
10
|
// extract from shared-core to make easily accessible from backend-core
|
|
11
11
|
export const isBuilder = sdk.users.isBuilder
|
|
12
12
|
export const isAdmin = sdk.users.isAdmin
|
|
13
|
+
export const isCreator = sdk.users.isCreator
|
|
13
14
|
export const isGlobalBuilder = sdk.users.isGlobalBuilder
|
|
14
15
|
export const isAdminOrBuilder = sdk.users.isAdminOrBuilder
|
|
15
16
|
export const hasAdminPermissions = sdk.users.hasAdminPermissions
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MonthlyQuotaName, QuotaUsage } from "@budibase/types"
|
|
2
2
|
|
|
3
|
-
export const usage = (): QuotaUsage => {
|
|
3
|
+
export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
|
|
4
4
|
return {
|
|
5
5
|
_id: "usage_quota",
|
|
6
6
|
quotaReset: new Date().toISOString(),
|
|
@@ -58,7 +58,8 @@ export const usage = (): QuotaUsage => {
|
|
|
58
58
|
usageQuota: {
|
|
59
59
|
apps: 0,
|
|
60
60
|
plugins: 0,
|
|
61
|
-
users
|
|
61
|
+
users,
|
|
62
|
+
creators,
|
|
62
63
|
userGroups: 0,
|
|
63
64
|
rows: 0,
|
|
64
65
|
triggers: {},
|