@budibase/backend-core 2.10.15 → 2.10.16-alpha.0

package/dist/tests/core/utilities/mocks/licenses.d.ts

@@ -17,7 +17,7 @@ export declare const useEnforceableSSO: () => License;
 export declare const useGroups: () => License;
 export declare const useEnvironmentVariables: () => License;
 export declare const useAuditLogs: () => License;
-export declare const usePublicApiUserRoles: () => License;
+export declare const useExpandedPublicApi: () => License;
 export declare const useScimIntegration: () => License;
 export declare const useSyncAutomations: () => License;
 export declare const useAppBuilders: () => License;

package/dist/tests/core/utilities/mocks/licenses.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setAutomationLogsQuota = exports.useViewPermissions = exports.useAppBuilders = exports.useSyncAutomations = exports.useScimIntegration = exports.usePublicApiUserRoles = exports.useAuditLogs = exports.useEnvironmentVariables = exports.useGroups = exports.useEnforceableSSO = exports.useBackups = exports.useCloudFree = exports.useUnlimited = exports.useLicense = exports.initInternal = exports.init = void 0;
+exports.setAutomationLogsQuota = exports.useViewPermissions = exports.useAppBuilders = exports.useSyncAutomations = exports.useScimIntegration = exports.useExpandedPublicApi = exports.useAuditLogs = exports.useEnvironmentVariables = exports.useGroups = exports.useEnforceableSSO = exports.useBackups = exports.useCloudFree = exports.useUnlimited = exports.useLicense = exports.initInternal = exports.init = void 0;
 const types_1 = require("@budibase/types");
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 let CLOUD_FREE_LICENSE;
@@ -75,10 +75,10 @@ const useAuditLogs = () => {
     return useFeature(types_1.Feature.AUDIT_LOGS);
 };
 exports.useAuditLogs = useAuditLogs;
-const usePublicApiUserRoles = () => {
-    return useFeature(types_1.Feature.USER_ROLE_PUBLIC_API);
+const useExpandedPublicApi = () => {
+    return useFeature(types_1.Feature.EXPANDED_PUBLIC_API);
 };
-exports.usePublicApiUserRoles = usePublicApiUserRoles;
+exports.useExpandedPublicApi = useExpandedPublicApi;
 const useScimIntegration = () => {
     return useFeature(types_1.Feature.SCIM);
 };

package/dist/tests/core/utilities/mocks/licenses.js.map

@@ -1 +1 @@
-{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/licenses.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"licenses.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/licenses.ts"],"names":[],"mappings":"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"}

package/dist/tests/core/utilities/structures/sso.js

@@ -30,8 +30,7 @@ exports.googleConfigDoc = exports.googleConfig = exports.jwtClaims = exports.oid
 const types_1 = require("@budibase/types");
 const generator_1 = require("./generator");
 const common_1 = require("./common");
-const shared = __importStar(require("./shared"));
-const shared_1 = require("./shared");
+const users = __importStar(require("./users"));
 const sample_1 = __importDefault(require("lodash/sample"));
 function OAuth() {
     return {
@@ -42,7 +41,7 @@ function OAuth() {
 exports.OAuth = OAuth;
 function authDetails(userDoc) {
     if (!userDoc) {
-        userDoc = (0, shared_1.user)();
+        userDoc = users.user();
     }
     const userId = userDoc._id || (0, common_1.uuid)();
     const provider = generator_1.generator.string();
@@ -65,7 +64,7 @@ function providerType() {
 exports.providerType = providerType;
 function ssoProfile(user) {
     if (!user) {
-        user = shared.user();
+        user = users.user();
     }
     return {
         id: user._id,

package/dist/tests/core/utilities/structures/sso.js.map

@@ -1 +1 @@
-{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/sso.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/sso.ts"],"names":[],"mappings":"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"}

package/dist/tests/core/utilities/structures/users.d.ts

@@ -1,8 +1,9 @@
-import { AdminUser, AdminOnlyUser, BuilderUser, SSOAuthDetails, SSOUser } from "@budibase/types";
-export { user, newEmail } from "./shared";
+import { AdminUser, AdminOnlyUser, BuilderUser, SSOAuthDetails, SSOUser, User } from "@budibase/types";
+export declare const newEmail: () => string;
+export declare const user: (userProps?: Partial<Omit<User, "userId">>) => User;
 export declare const adminUser: (userProps?: any) => AdminUser;
 export declare const adminOnlyUser: (userProps?: any) => AdminOnlyUser;
-export declare const builderUser: (userProps?: any) => BuilderUser;
+export declare const builderUser: (userProps?: Partial<User>) => BuilderUser;
 export declare const appBuilderUser: (appId: string, userProps?: any) => BuilderUser;
 export declare function ssoUser(opts?: {
     user?: any;

package/dist/tests/core/utilities/structures/users.js

@@ -1,13 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ssoUser = exports.appBuilderUser = exports.builderUser = exports.adminOnlyUser = exports.adminUser = exports.newEmail = exports.user = void 0;
-const shared_1 = require("./shared");
+exports.ssoUser = exports.appBuilderUser = exports.builderUser = exports.adminOnlyUser = exports.adminUser = exports.user = exports.newEmail = void 0;
 const sso_1 = require("./sso");
-var shared_2 = require("./shared");
-Object.defineProperty(exports, "user", { enumerable: true, get: function () { return shared_2.user; } });
-Object.defineProperty(exports, "newEmail", { enumerable: true, get: function () { return shared_2.newEmail; } });
+const common_1 = require("./common");
+const generator_1 = require("./generator");
+const _1 = require(".");
+const newEmail = () => {
+    return `${(0, common_1.uuid)()}@test.com`;
+};
+exports.newEmail = newEmail;
+const user = (userProps) => {
+    const userId = userProps === null || userProps === void 0 ? void 0 : userProps._id;
+    return Object.assign({ _id: userId, userId, email: (0, exports.newEmail)(), password: "test", roles: { app_test: "admin" }, firstName: generator_1.generator.first(), lastName: generator_1.generator.last(), pictureUrl: "http://test.com", tenantId: _1.tenant.id() }, userProps);
+};
+exports.user = user;
 const adminUser = (userProps) => {
-    return Object.assign(Object.assign({}, (0, shared_1.user)(userProps)), { admin: {
+    return Object.assign(Object.assign({}, (0, exports.user)(userProps)), { admin: {
             global: true,
         }, builder: {
             global: true,
@@ -15,26 +23,26 @@ const adminUser = (userProps) => {
 };
 exports.adminUser = adminUser;
 const adminOnlyUser = (userProps) => {
-    return Object.assign(Object.assign({}, (0, shared_1.user)(userProps)), { admin: {
+    return Object.assign(Object.assign({}, (0, exports.user)(userProps)), { admin: {
             global: true,
         } });
 };
 exports.adminOnlyUser = adminOnlyUser;
 const builderUser = (userProps) => {
-    return Object.assign(Object.assign({}, (0, shared_1.user)(userProps)), { builder: {
+    return Object.assign(Object.assign({}, (0, exports.user)(userProps)), { builder: {
             global: true,
         } });
 };
 exports.builderUser = builderUser;
 const appBuilderUser = (appId, userProps) => {
-    return Object.assign(Object.assign({}, (0, shared_1.user)(userProps)), { builder: {
+    return Object.assign(Object.assign({}, (0, exports.user)(userProps)), { builder: {
             apps: [appId],
         } });
 };
 exports.appBuilderUser = appBuilderUser;
 function ssoUser(opts = {}) {
     var _a, _b, _c;
-    const base = (0, shared_1.user)(opts.user);
+    const base = (0, exports.user)(opts.user);
     delete base.password;
     if (!opts.details) {
         opts.details = (0, sso_1.authDetails)(base);

package/dist/tests/core/utilities/structures/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAOA,qCAA+B;AAC/B,+BAAmC;AAEnC,mCAAyC;AAAhC,8FAAA,IAAI,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAEhB,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,aAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,aAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAe,EAAe,EAAE;IAC1D,uCACK,IAAA,aAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,aAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,aAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;KACjC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,EACzC,iBAAiB,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,IACF;AACH,CAAC;AArBD,0BAqBC"}
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAQA,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,WAAW,CAAA;AAC7B,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC5B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE,EAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,SAAM,CAAC,EAAE,EAAE,IAClB,SAAS,EACb;AACH,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB;AAEM,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAyB,EAAe,EAAE;IACpE,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,YAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;KACjC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,EACzC,iBAAiB,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,IACF;AACH,CAAC;AArBD,0BAqBC"}

package/dist/tests/extra/DBTestConfiguration.d.ts

@@ -3,7 +3,7 @@ declare class DBTestConfiguration {
     tenantId: string;
     constructor();
     newTenant(): void;
-    doInTenant(task: any): Promise<any>;
+    doInTenant<T>(task: () => Promise<T>): Promise<Promise<T>>;
     getTenantId(): string;
 }
 export default DBTestConfiguration;

package/dist/tests/extra/DBTestConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBTestConfiguration.js","sourceRoot":"","sources":["../../../tests/extra/DBTestConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgC;AAChC,yEAA0D;AAC1D,mDAAoC;AACpC,2DAA4C;AAE5C,MAAM,mBAAmB;IAGvB;QACE,wDAAwD;QACxD,OAAO,CAAC,WAAW,EAAE,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,UAAU;IAEV,UAAU,CAAC,IAAS;QAClB,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC5C,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,WAAW;QACT,IAAI;YACF,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC,QAAS,CAAA;SACtB;IACH,CAAC;CACF;AAED,kBAAe,mBAAmB,CAAA"}
+{"version":3,"file":"DBTestConfiguration.js","sourceRoot":"","sources":["../../../tests/extra/DBTestConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgC;AAChC,yEAA0D;AAC1D,mDAAoC;AACpC,2DAA4C;AAE5C,MAAM,mBAAmB;IAGvB;QACE,wDAAwD;QACxD,OAAO,CAAC,WAAW,EAAE,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,UAAU;IAEV,UAAU,CAAI,IAAsB;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC5C,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,WAAW;QACT,IAAI;YACF,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC,QAAS,CAAA;SACtB;IACH,CAAC;CACF;AAED,kBAAe,mBAAmB,CAAA"}

package/dist/tests/index.d.ts

@@ -1 +1,2 @@
 export * from "./core/utilities";
+export * from "./extra";

package/dist/tests/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./core/utilities"), exports);
+__exportStar(require("./extra"), exports);
 //# sourceMappingURL=index.js.map

package/dist/tests/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tests/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tests/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,0CAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.10.15",
+  "version": "2.10.16-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/shared-core": "2.10.15",
-    "@budibase/types": "2.10.15",
+    "@budibase/shared-core": "2.10.16-alpha.0",
+    "@budibase/types": "2.10.16-alpha.0",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
     "aws-sdk": "2.1030.0",
@@ -33,17 +33,14 @@
     "bull": "4.10.1",
     "correlation-id": "4.0.0",
     "dotenv": "16.0.1",
-    "emitter-listener": "1.1.2",
     "ioredis": "5.3.2",
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.0",
     "koa-passport": "4.1.4",
     "koa-pino-logger": "4.0.0",
     "lodash": "4.17.21",
-    "lodash.isarguments": "3.1.0",
     "node-fetch": "2.6.7",
     "passport-google-oauth": "2.0.0",
-    "passport-jwt": "4.0.0",
     "passport-local": "1.0.0",
     "passport-oauth2-refresh": "^2.1.0",
     "pino": "8.11.0",
@@ -59,14 +56,13 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@jest/test-sequencer": "29.6.2",
     "@shopify/jest-koa-mocks": "5.1.1",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
     "@trendyol/jest-testcontainers": "^2.1.1",
     "@types/chance": "1.1.3",
+    "@types/cookies": "0.7.8",
     "@types/jest": "29.5.3",
-    "@types/koa": "2.13.4",
     "@types/lodash": "4.14.180",
     "@types/node": "18.17.0",
     "@types/node-fetch": "2.6.4",
@@ -80,14 +76,10 @@
     "jest": "29.6.2",
     "jest-environment-node": "29.6.2",
     "jest-serial-runner": "1.2.1",
-    "koa": "2.13.4",
-    "nodemon": "2.0.16",
     "pino-pretty": "10.0.0",
     "pouchdb-adapter-memory": "7.2.2",
     "timekeeper": "2.2.0",
-    "ts-node": "10.8.1",
-    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
   },
   "nx": {
     "targets": {
@@ -104,5 +96,5 @@
       }
     }
   },
-  "gitHead": "1aff0770f2da0ed9c21e4079284f08587fe3ed7d"
+  "gitHead": "f373448384d66541cf3dfaf59bd1df32efd3661b"
 }

package/src/cache/tests/user.spec.ts

@@ -0,0 +1,145 @@
+import { User } from "@budibase/types"
+import { generator, structures } from "../../../tests"
+import { DBTestConfiguration } from "../../../tests/extra"
+import { getUsers } from "../user"
+import { getGlobalDB } from "../../context"
+import _ from "lodash"
+
+import * as redis from "../../redis/init"
+import { UserDB } from "../../users"
+
+const config = new DBTestConfiguration()
+
+describe("user cache", () => {
+  describe("getUsers", () => {
+    const users: User[] = []
+    beforeAll(async () => {
+      const userCount = 10
+      const userIds = generator.arrayOf(() => generator.guid(), {
+        min: userCount,
+        max: userCount,
+      })
+
+      await config.doInTenant(async () => {
+        const db = getGlobalDB()
+        for (const userId of userIds) {
+          const user = structures.users.user({ _id: userId })
+          await db.put(user)
+          users.push(user)
+        }
+      })
+    })
+
+    beforeEach(async () => {
+      jest.clearAllMocks()
+
+      const redisClient = await redis.getUserClient()
+      await redisClient.clear()
+    })
+
+    it("when no user is in cache, all of them are retrieved from db", async () => {
+      const usersToRequest = _.sampleSize(users, 5)
+
+      const userIdsToRequest = usersToRequest.map(x => x._id!)
+
+      jest.spyOn(UserDB, "bulkGet")
+
+      const results = await config.doInTenant(() => getUsers(userIdsToRequest))
+
+      expect(results.users).toHaveLength(5)
+      expect(results).toEqual({
+        users: usersToRequest.map(u => ({
+          ...u,
+          budibaseAccess: true,
+          _rev: expect.any(String),
+        })),
+      })
+
+      expect(UserDB.bulkGet).toBeCalledTimes(1)
+      expect(UserDB.bulkGet).toBeCalledWith(userIdsToRequest)
+    })
+
+    it("on a second all, all of them are retrieved from cache", async () => {
+      const usersToRequest = _.sampleSize(users, 5)
+
+      const userIdsToRequest = usersToRequest.map(x => x._id!)
+
+      jest.spyOn(UserDB, "bulkGet")
+
+      await config.doInTenant(() => getUsers(userIdsToRequest))
+      const resultsFromCache = await config.doInTenant(() =>
+        getUsers(userIdsToRequest)
+      )
+
+      expect(resultsFromCache.users).toHaveLength(5)
+      expect(resultsFromCache).toEqual({
+        users: expect.arrayContaining(
+          usersToRequest.map(u => ({
+            ...u,
+            budibaseAccess: true,
+            _rev: expect.any(String),
+          }))
+        ),
+      })
+
+      expect(UserDB.bulkGet).toBeCalledTimes(1)
+    })
+
+    it("when some users are cached, only the missing ones are retrieved from db", async () => {
+      const usersToRequest = _.sampleSize(users, 5)
+
+      const userIdsToRequest = usersToRequest.map(x => x._id!)
+
+      jest.spyOn(UserDB, "bulkGet")
+
+      await config.doInTenant(() =>
+        getUsers([userIdsToRequest[0], userIdsToRequest[3]])
+      )
+      ;(UserDB.bulkGet as jest.Mock).mockClear()
+
+      const results = await config.doInTenant(() => getUsers(userIdsToRequest))
+
+      expect(results.users).toHaveLength(5)
+      expect(results).toEqual({
+        users: expect.arrayContaining(
+          usersToRequest.map(u => ({
+            ...u,
+            budibaseAccess: true,
+            _rev: expect.any(String),
+          }))
+        ),
+      })
+
+      expect(UserDB.bulkGet).toBeCalledTimes(1)
+      expect(UserDB.bulkGet).toBeCalledWith([
+        userIdsToRequest[1],
+        userIdsToRequest[2],
+        userIdsToRequest[4],
+      ])
+    })
+
+    it("requesting existing and unexisting ids will return found ones", async () => {
+      const usersToRequest = _.sampleSize(users, 3)
+      const missingIds = [generator.guid(), generator.guid()]
+
+      const userIdsToRequest = _.shuffle([
+        ...missingIds,
+        ...usersToRequest.map(x => x._id!),
+      ])
+
+      const results = await config.doInTenant(() => getUsers(userIdsToRequest))
+
+      expect(results.users).toHaveLength(3)
+      expect(results).toEqual({
+        users: expect.arrayContaining(
+          usersToRequest.map(u => ({
+            ...u,
+            budibaseAccess: true,
+            _rev: expect.any(String),
+          }))
+        ),
+        notFoundIds: expect.arrayContaining(missingIds),
+      })
+    })
+  })
+})

package/src/cache/user.ts

@@ -6,6 +6,7 @@ import env from "../environment"
 import * as accounts from "../accounts"
 import { UserDB } from "../users"
 import { sdk } from "@budibase/shared-core"
+import { User } from "@budibase/types"
 
 const EXPIRY_SECONDS = 3600
 
@@ -27,6 +28,35 @@ async function populateFromDB(userId: string, tenantId: string) {
   return user
 }
 
+async function populateUsersFromDB(
+  userIds: string[]
+): Promise<{ users: User[]; notFoundIds?: string[] }> {
+  const getUsersResponse = await UserDB.bulkGet(userIds)
+
+  // Handle missed user ids
+  const notFoundIds = userIds.filter((uid, i) => !getUsersResponse[i])
+
+  const users = getUsersResponse.filter(x => x)
+
+  await Promise.all(
+    users.map(async (user: any) => {
+      user.budibaseAccess = true
+      if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
+        const account = await accounts.getAccount(user.email)
+        if (account) {
+          user.account = account
+          user.accountPortalAccess = true
+        }
+      }
+    })
+  )
+
+  if (notFoundIds.length) {
+    return { users, notFoundIds }
+  }
+  return { users }
+}
+
 /**
  * Get the requested user by id.
  * Use redis cache to first read the user.
@@ -77,6 +107,36 @@ export async function getUser(
   return user
 }
 
+/**
+ * Get the requested users by id.
+ * Use redis cache to first read the users.
+ * If not present fallback to loading the users directly and re-caching.
+ * @param {*} userIds the ids of the user to get
+ * @param {*} tenantId the tenant of the users to get
+ * @returns
+ */
+export async function getUsers(
+  userIds: string[]
+): Promise<{ users: User[]; notFoundIds?: string[] }> {
+  const client = await redis.getUserClient()
+  // try cache
+  let usersFromCache = await client.bulkGet<User>(userIds)
+  const missingUsersFromCache = userIds.filter(uid => !usersFromCache[uid])
+  const users = Object.values(usersFromCache)
+  let notFoundIds
+
+  if (missingUsersFromCache.length) {
+    const usersFromDb = await populateUsersFromDB(missingUsersFromCache)
+
+    notFoundIds = usersFromDb.notFoundIds
+    for (const userToCache of usersFromDb.users) {
+      await client.store(userToCache._id!, userToCache, EXPIRY_SECONDS)
+    }
+    users.push(...usersFromDb.users)
+  }
+  return { users, notFoundIds: notFoundIds }
+}
+
 export async function invalidateUser(userId: string) {
   const client = await redis.getUserClient()
   await client.delete(userId)

package/src/middleware/passport/sso/tests/sso.spec.ts

@@ -102,6 +102,7 @@ describe("sso", () => {
 
           // modified external id to match user format
           ssoUser._id = "us_" + details.userId
+          delete ssoUser.userId
 
           // new sso user won't have a password
           delete ssoUser.password

package/src/redis/redis.ts

@@ -242,7 +242,7 @@ class RedisWrapper {
     }
   }
 
-  async bulkGet(keys: string[]) {
+  async bulkGet<T>(keys: string[]) {
     const db = this._db
     if (keys.length === 0) {
       return {}
@@ -250,7 +250,7 @@ class RedisWrapper {
     const prefixedKeys = keys.map(key => addDbPrefix(db, key))
     let response = await this.getClient().mget(prefixedKeys)
     if (Array.isArray(response)) {
-      let final: any = {}
+      let final: Record<string, T> = {}
       let count = 0
       for (let result of response) {
         if (result) {

package/src/utils/utils.ts

@@ -10,7 +10,7 @@ import {
   Event,
   TenantResolutionStrategy,
 } from "@budibase/types"
-import { SetOption } from "cookies"
+import type { SetOption } from "cookies"
 const jwt = require("jsonwebtoken")
 
 const APP_PREFIX = DocumentType.APP + SEPARATOR

package/tests/core/utilities/mocks/licenses.ts

@@ -86,8 +86,8 @@ export const useAuditLogs = () => {
   return useFeature(Feature.AUDIT_LOGS)
 }
 
-export const usePublicApiUserRoles = () => {
-  return useFeature(Feature.USER_ROLE_PUBLIC_API)
+export const useExpandedPublicApi = () => {
+  return useFeature(Feature.EXPANDED_PUBLIC_API)
 }
 
 export const useScimIntegration = () => {

package/tests/core/utilities/structures/sso.ts

@@ -13,8 +13,7 @@ import {
 } from "@budibase/types"
 import { generator } from "./generator"
 import { email, uuid } from "./common"
-import * as shared from "./shared"
-import { user } from "./shared"
+import * as users from "./users"
 import sample from "lodash/sample"
 
 export function OAuth(): OAuth2 {
@@ -26,7 +25,7 @@ export function OAuth(): OAuth2 {
 
 export function authDetails(userDoc?: User): SSOAuthDetails {
   if (!userDoc) {
-    userDoc = user()
+    userDoc = users.user()
   }
 
   const userId = userDoc._id || uuid()
@@ -52,7 +51,7 @@ export function providerType(): SSOProviderType {
 
 export function ssoProfile(user?: User): SSOProfile {
   if (!user) {
-    user = shared.user()
+    user = users.user()
   }
   return {
     id: user._id!,

package/tests/core/utilities/structures/users.ts

@@ -4,11 +4,32 @@ import {
   BuilderUser,
   SSOAuthDetails,
   SSOUser,
+  User,
 } from "@budibase/types"
-import { user } from "./shared"
 import { authDetails } from "./sso"
+import { uuid } from "./common"
+import { generator } from "./generator"
+import { tenant } from "."
 
-export { user, newEmail } from "./shared"
+export const newEmail = () => {
+  return `${uuid()}@test.com`
+}
+
+export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
+  const userId = userProps?._id
+  return {
+    _id: userId,
+    userId,
+    email: newEmail(),
+    password: "test",
+    roles: { app_test: "admin" },
+    firstName: generator.first(),
+    lastName: generator.last(),
+    pictureUrl: "http://test.com",
+    tenantId: tenant.id(),
+    ...userProps,
+  }
+}
 
 export const adminUser = (userProps?: any): AdminUser => {
   return {
@@ -31,7 +52,7 @@ export const adminOnlyUser = (userProps?: any): AdminOnlyUser => {
   }
 }
 
-export const builderUser = (userProps?: any): BuilderUser => {
+export const builderUser = (userProps?: Partial<User>): BuilderUser => {
   return {
     ...user(userProps),
     builder: {

package/tests/extra/DBTestConfiguration.ts

@@ -18,7 +18,7 @@ class DBTestConfiguration {
 
   // TENANCY
 
-  doInTenant(task: any) {
+  doInTenant<T>(task: () => Promise<T>) {
     return context.doInTenant(this.tenantId, () => {
       return task()
     })

package/tests/index.ts

@@ -1 +1,2 @@
 export * from "./core/utilities"
+export * from "./extra"

package/dist/tests/core/utilities/structures/shared.d.ts

@@ -1,3 +0,0 @@
-import { User } from "@budibase/types";
-export declare const newEmail: () => string;
-export declare const user: (userProps?: any) => User;