@budibase/server 2.4.42 → 2.4.44-alpha.0

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.4.41",
+    "version": "2.4.43",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -15,6 +15,7 @@
         "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
         "test": "bash scripts/test.sh",
+        "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
         "test:watch": "jest --watch",
         "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
         "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
@@ -43,12 +44,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.4.41",
-        "@budibase/client": "^2.4.41",
-        "@budibase/pro": "2.4.41",
-        "@budibase/shared-core": "^2.4.41",
-        "@budibase/string-templates": "^2.4.41",
-        "@budibase/types": "^2.4.41",
+        "@budibase/backend-core": "^2.4.43",
+        "@budibase/client": "^2.4.43",
+        "@budibase/pro": "2.4.43",
+        "@budibase/shared-core": "^2.4.43",
+        "@budibase/string-templates": "^2.4.43",
+        "@budibase/types": "^2.4.43",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -125,7 +126,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@jest/test-sequencer": "24.9.0",
+        "@jest/test-sequencer": "29.5.0",
         "@swc/core": "^1.3.25",
         "@swc/jest": "^0.2.24",
         "@trendyol/jest-testcontainers": "^2.1.1",
@@ -134,7 +135,7 @@
         "@types/global-agent": "2.1.1",
         "@types/google-spreadsheet": "3.1.5",
         "@types/ioredis": "4.28.10",
-        "@types/jest": "27.5.1",
+        "@types/jest": "29.5.0",
         "@types/koa": "2.13.4",
         "@types/koa__router": "8.0.8",
         "@types/lodash": "4.14.180",
@@ -154,7 +155,7 @@
         "eslint": "6.8.0",
         "ioredis-mock": "7.2.0",
         "is-wsl": "2.2.0",
-        "jest": "28.1.1",
+        "jest": "29.5.0",
         "jest-openapi": "0.14.2",
         "jest-serial-runner": "^1.2.1",
         "nodemon": "2.0.15",
@@ -166,7 +167,7 @@
         "supertest": "6.2.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
-        "ts-jest": "28.0.4",
+        "ts-jest": "29.0.5",
         "ts-node": "10.8.1",
         "tsconfig-paths": "4.0.0",
         "typescript": "4.7.3",

package/dist/sdk/users/utils.js

@@ -15,16 +15,21 @@ const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../db/utils");
 const lodash_1 = require("lodash");
 function combineMetadataAndUser(user, metadata) {
+    const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
+    const found = Array.isArray(metadata)
+        ? metadata.find(doc => doc._id === metadataId)
+        : metadata;
     // skip users with no access
-    if (user.roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+    if (user.roleId == null ||
+        user.roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+        // If it exists and it should not, we must remove it
+        if (found === null || found === void 0 ? void 0 : found._id) {
+            return Object.assign(Object.assign({}, found), { _deleted: true });
+        }
         return null;
     }
     delete user._rev;
-    const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
     const newDoc = Object.assign(Object.assign({}, user), { _id: metadataId, tableId: utils_1.InternalTables.USER_METADATA });
-    const found = Array.isArray(metadata)
-        ? metadata.find(doc => doc._id === metadataId)
-        : metadata;
     // copy rev over for the purposes of equality check
     if (found) {
         newDoc._rev = found._rev;
@@ -54,7 +59,7 @@ function syncGlobalUsers() {
         ]);
         const toWrite = [];
         for (let user of users) {
-            const combined = yield combineMetadataAndUser(user, metadata);
+            const combined = combineMetadataAndUser(user, metadata);
             if (combined) {
                 toWrite.push(combined);
             }