@budibase/server 2.2.12-alpha.2 → 2.2.12-alpha.20

package/dist/utilities/fileSystem/filesystem.js

@@ -17,7 +17,7 @@ const { budibaseTempDir } = require("../budibaseDir");
 const fs = require("fs");
 const { join } = require("path");
 const uuid = require("uuid/v4");
-const env = require("../../environment");
+const environment_1 = __importDefault(require("../../environment"));
 const tar_1 = __importDefault(require("tar"));
 exports.TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
 /**
@@ -38,7 +38,7 @@ const init = () => {
         }
     }
     const clientLibPath = join(budibaseTempDir(), "budibase-client.js");
-    if (env.isTest() && !fs.existsSync(clientLibPath)) {
+    if (environment_1.default.isTest() && !fs.existsSync(clientLibPath)) {
         fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
     }
 };
@@ -48,7 +48,7 @@ exports.init = init;
  * everything required to function is ready.
  */
 const checkDevelopmentEnvironment = () => {
-    if (!env.isDev() || env.isTest()) {
+    if (!environment_1.default.isDev() || environment_1.default.isTest()) {
         return;
     }
     if (!fs.existsSync(budibaseTempDir())) {

package/dist/utilities/scriptRunner.js

@@ -2,6 +2,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const vm2_1 = require("vm2");
 const JS_TIMEOUT_MS = 1000;
@@ -22,4 +23,4 @@ class ScriptRunner {
         return this.results.out;
     }
 }
-module.exports = ScriptRunner;
+exports.default = ScriptRunner;

package/dist/utilities/statusCodes.js

@@ -1,5 +1,6 @@
 "use strict";
-module.exports = {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
     OK: 200,
     UNAUTHORIZED: 401,
     FORBIDDEN: 403,

package/dist/utilities/workerRequests.js

@@ -41,6 +41,8 @@ function request(ctx, request) {
     if (ctx && ctx.headers) {
         request.headers = ctx.headers;
     }
+    // add x-budibase-correlation-id header
+    backend_core_1.logging.correlation.setHeader(request.headers);
     return request;
 }
 exports.request = request;

package/dist/watch.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,13 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = void 0;
 const path_1 = __importDefault(require("path"));
-const env = __importStar(require("./environment"));
+const environment_1 = __importDefault(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
 const plugin_1 = require("./api/controllers/plugin");
 function watch() {
-    const watchPath = path_1.default.join(env.PLUGINS_DIR, "./**/*.tar.gz");
+    const watchPath = path_1.default.join(environment_1.default.PLUGINS_DIR, "./**/*.tar.gz");
     chokidar_1.default
         .watch(watchPath, {
         ignored: "**/node_modules",

package/jest.config.ts

@@ -2,15 +2,18 @@ import { Config } from "@jest/types"
 import * as fs from "fs"
 
 const config: Config.InitialOptions = {
-  preset: "ts-jest",
   testEnvironment: "node",
-  setupFiles: ["./src/tests/jestSetup.ts"],
+  setupFiles: ["./src/tests/jestEnv.ts"],
+  setupFilesAfterEnv: ["./src/tests/jestSetup.ts"],
   collectCoverageFrom: [
     "src/**/*.{js,ts}",
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
   ],
   coverageReporters: ["lcov", "json", "clover"],
+  transform: {
+    "^.+\\.ts?$": "@swc/jest",
+  },
 }
 
 if (!process.env.CI) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.2",
+  "version": "2.2.12-alpha.20",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.2.12-alpha.2",
-    "@budibase/client": "2.2.12-alpha.2",
-    "@budibase/pro": "2.2.12-alpha.1",
-    "@budibase/string-templates": "2.2.12-alpha.2",
-    "@budibase/types": "2.2.12-alpha.2",
+    "@budibase/backend-core": "2.2.12-alpha.20",
+    "@budibase/client": "2.2.12-alpha.20",
+    "@budibase/pro": "2.2.12-alpha.19",
+    "@budibase/string-templates": "2.2.12-alpha.20",
+    "@budibase/types": "2.2.12-alpha.20",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -123,6 +123,8 @@
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
     "@jest/test-sequencer": "24.9.0",
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
     "@types/global-agent": "2.1.1",
@@ -167,5 +169,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "f33fe0fc19b1a8566d7c1262bb329fbecdaa9586"
+  "gitHead": "bf18dd279d7241ab5945639cf3ded4ffb9e4fa07"
 }

package/src/api/controllers/query/index.ts

@@ -4,12 +4,12 @@ import { Thread, ThreadType } from "../../../threads"
 import { save as saveDatasource } from "../datasource"
 import { RestImporter } from "./import"
 import { invalidateDynamicVariables } from "../../../threads/utils"
-import { QUERY_THREAD_TIMEOUT } from "../../../environment"
+import env from "../../../environment"
 import { quotas } from "@budibase/pro"
 import { events, context, utils, constants } from "@budibase/backend-core"
 
 const Runner = new Thread(ThreadType.QUERY, {
-  timeoutMs: QUERY_THREAD_TIMEOUT || 10000,
+  timeoutMs: env.QUERY_THREAD_TIMEOUT || 10000,
 })
 
 // simple function to append "readable" to all read queries

package/src/api/controllers/static/index.ts

@@ -10,7 +10,7 @@ const {
   NODE_MODULES_PATH,
   TOP_LEVEL_PATH,
 } = require("../../../utilities/fileSystem")
-const env = require("../../../environment")
+import env from "../../../environment"
 const { DocumentType } = require("../../../db/utils")
 const { context, objectStore, utils } = require("@budibase/backend-core")
 const AWS = require("aws-sdk")

package/src/api/controllers/table/internal.ts

@@ -3,7 +3,7 @@ import { getRowParams, generateTableID } from "../../../db/utils"
 import { FieldTypes } from "../../../constants"
 import { TableSaveFunctions, hasTypeChanged, handleDataImport } from "./utils"
 import { context } from "@budibase/backend-core"
-import { isTest } from "../../../environment"
+import env from "../../../environment"
 import {
   cleanupAttachments,
   fixAutoColumnSubType,
@@ -13,7 +13,6 @@ import { Table } from "@budibase/types"
 import { quotas } from "@budibase/pro"
 import { isEqual } from "lodash"
 import { cloneDeep } from "lodash/fp"
-import env from "../../../environment"
 import sdk from "../../../sdk"
 
 function checkAutoColumns(table: Table, oldTable: Table) {
@@ -164,7 +163,7 @@ export async function destroy(ctx: any) {
   await db.remove(tableToDelete._id, tableToDelete._rev)
 
   // remove table search index
-  if (!isTest() || env.COUCH_DB_URL) {
+  if (!env.isTest() || env.COUCH_DB_URL) {
     const currentIndexes = await db.getIndexes()
     const existingIndex = currentIndexes.indexes.find(
       (existing: any) => existing.name === `search:${ctx.params.tableId}`

package/src/api/controllers/user.ts

@@ -4,19 +4,21 @@ import { getGlobalUsers, getRawGlobalUser } from "../../utilities/global"
 import { getFullUser } from "../../utilities/users"
 import {
   context,
-  constants,
   roles as rolesCore,
   db as dbCore,
 } from "@budibase/backend-core"
-import { BBContext, User } from "@budibase/types"
+import { BBContext, Ctx, SyncUserRequest, User } from "@budibase/types"
 import sdk from "../../sdk"
 
-export async function syncUser(ctx: BBContext) {
+export async function syncUser(ctx: Ctx<SyncUserRequest>) {
   let deleting = false,
     user: User | any
   const userId = ctx.params.id
+
+  const previousUser = ctx.request.body?.previousUser
+
   try {
-    user = await getRawGlobalUser(userId)
+    user = (await getRawGlobalUser(userId)) as User
   } catch (err: any) {
     if (err && err.status === 404) {
       user = {}
@@ -25,6 +27,11 @@ export async function syncUser(ctx: BBContext) {
       throw err
     }
   }
+
+  let previousApps = previousUser
+    ? Object.keys(previousUser.roles).map(appId => appId)
+    : []
+
   const roles = deleting ? {} : user.roles
   // remove props which aren't useful to metadata
   delete user.password
@@ -40,8 +47,9 @@ export async function syncUser(ctx: BBContext) {
       .filter(entry => entry[1] !== rolesCore.BUILTIN_ROLE_IDS.PUBLIC)
       .map(([appId]) => appId)
   }
-  for (let prodAppId of prodAppIds) {
+  for (let prodAppId of new Set([...prodAppIds, ...previousApps])) {
     const roleId = roles[prodAppId]
+    const deleteFromApp = !roleId
     const devAppId = dbCore.getDevelopmentAppID(prodAppId)
     for (let appId of [prodAppId, devAppId]) {
       if (!(await dbCore.dbExists(appId))) {
@@ -54,24 +62,24 @@ export async function syncUser(ctx: BBContext) {
         try {
           metadata = await db.get(metadataId)
         } catch (err) {
-          if (deleting) {
+          if (deleteFromApp) {
             return
           }
           metadata = {
             tableId: InternalTables.USER_METADATA,
           }
         }
+
+        if (deleteFromApp) {
+          await db.remove(metadata)
+          return
+        }
+
         // assign the roleId for the metadata doc
         if (roleId) {
           metadata.roleId = roleId
         }
-        let combined = !deleting
-          ? sdk.users.combineMetadataAndUser(user, metadata)
-          : {
-              ...metadata,
-              status: constants.UserStatus.INACTIVE,
-              metadata: rolesCore.BUILTIN_ROLE_IDS.PUBLIC,
-            }
+        let combined = sdk.users.combineMetadataAndUser(user, metadata)
         // if its null then there was no updates required
         if (combined) {
           await db.put(combined)

package/src/api/controllers/view/tests/viewBuilder.spec.js

@@ -1,4 +1,4 @@
-const viewTemplate = require("../viewBuilder");
+const viewTemplate = require("../viewBuilder").default;
 
 describe("viewBuilder", () => {
 

package/src/api/controllers/view/viewBuilder.ts

@@ -136,7 +136,7 @@ function parseEmitExpression(field: string, groupBy: string) {
  * filters: Array of filter objects containing predicates that are parsed into a JS expression
  * calculation: an optional calculation to be performed over the view data.
  */
-export = function ({
+export default function ({
   field,
   tableId,
   groupBy,

package/src/api/routes/analytics.ts

@@ -6,4 +6,4 @@ const router: Router = new Router()
 router.get("/api/bbtel", controller.isEnabled)
 router.post("/api/bbtel/ping", controller.ping)
 
-export = router
+export default router

package/src/api/routes/apikeys.ts

@@ -9,4 +9,4 @@ router
   .get("/api/keys", authorized(permissions.BUILDER), controller.fetch)
   .put("/api/keys/:key", authorized(permissions.BUILDER), controller.update)
 
-export = router
+export default router

package/src/api/routes/application.ts

@@ -54,4 +54,4 @@ router
     controller.destroy
   )
 
-export = router
+export default router

package/src/api/routes/auth.ts

@@ -5,4 +5,4 @@ const router: Router = new Router()
 
 router.get("/api/self", controller.fetchSelf)
 
-export = router
+export default router

package/src/api/routes/automation.ts

@@ -84,4 +84,4 @@ router
     controller.test
   )
 
-export = router
+export default router

package/src/api/routes/backup.ts

@@ -11,4 +11,4 @@ router.get(
   controller.exportAppDump
 )
 
-export = router
+export default router

package/src/api/routes/cloud.ts

@@ -15,4 +15,4 @@ router
   .post("/api/cloud/import", controller.importApps)
   .get("/api/cloud/import/complete", controller.hasBeenImported)
 
-export = router
+export default router

package/src/api/routes/component.ts

@@ -11,4 +11,4 @@ router.get(
   controller.fetchAppComponentDefinitions
 )
 
-export = router
+export default router

package/src/api/routes/datasource.ts

@@ -57,4 +57,4 @@ router
     datasourceController.destroy
   )
 
-export = router
+export default router

package/src/api/routes/deploy.ts

@@ -17,4 +17,4 @@ router
     controller.deploymentProgress
   )
 
-export = router
+export default router

package/src/api/routes/dev.ts

@@ -35,4 +35,4 @@ router
     controller.revert
   )
 
-export = router
+export default router

package/src/api/routes/integration.ts

@@ -13,4 +13,4 @@ router
     controller.find
   )
 
-export = router
+export default router

package/src/api/routes/layout.ts

@@ -13,4 +13,4 @@ router
     controller.destroy
   )
 
-export = router
+export default router

package/src/api/routes/metadata.ts

@@ -35,4 +35,4 @@ router
     controller.getMetadata
   )
 
-export = router
+export default router

package/src/api/routes/migrations.ts

@@ -11,4 +11,4 @@ router
     auth.internalApi,
     migrationsController.fetchDefinitions
   )
-export = router
+export default router

package/src/api/routes/permission.ts

@@ -38,4 +38,4 @@ router
     controller.removePermission
   )
 
-export = router
+export default router

package/src/api/routes/query.ts

@@ -58,4 +58,4 @@ router
     queryController.executeV2 as any
   )
 
-export = router
+export default router

package/src/api/routes/role.ts

@@ -21,4 +21,4 @@ router
     controller.destroy
   )
 
-export = router
+export default router

package/src/api/routes/routing.ts

@@ -11,4 +11,4 @@ router
   // gets the full structure, not just the correct screen ID for user role
   .get("/api/routing", authorized(permissions.BUILDER), controller.fetch)
 
-export = router
+export default router

package/src/api/routes/screen.ts

@@ -20,4 +20,4 @@ router
     controller.destroy
   )
 
-export = router
+export default router

package/src/api/routes/script.ts

@@ -7,4 +7,4 @@ const router: Router = new Router()
 
 router.post("/api/script", authorized(permissions.BUILDER), controller.save)
 
-export = router
+export default router

package/src/api/routes/static.ts

@@ -3,7 +3,7 @@ import * as controller from "../controllers/static"
 import { budibaseTempDir } from "../../utilities/budibaseDir"
 import authorized from "../../middleware/authorized"
 import { permissions } from "@budibase/backend-core"
-import * as env from "../../environment"
+import env from "../../environment"
 import { paramResource } from "../../middleware/resourceId"
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
@@ -62,4 +62,4 @@ router
     controller.getSignedUploadURL
   )
 
-export = router
+export default router

package/src/api/routes/table.ts

@@ -190,4 +190,4 @@ router
     tableController.bulkImport
   )
 
-export = router
+export default router

package/src/api/routes/templates.ts

@@ -13,4 +13,4 @@ router
     controller.downloadTemplate
   )
 
-export = router
+export default router

package/src/api/routes/tests/plugin.spec.ts

@@ -1,8 +1,3 @@
-let mockObjectStore = jest.fn().mockImplementation(() => {
-  return [{ name: "test.js" }]
-})
-
-let deleteFolder = jest.fn().mockImplementation()
 jest.mock("@budibase/backend-core", () => {
   const core = jest.requireActual("@budibase/backend-core")
   return {
@@ -10,15 +5,20 @@ jest.mock("@budibase/backend-core", () => {
     objectStore: {
       ...core.objectStore,
       upload: jest.fn(),
-      uploadDirectory: mockObjectStore,
-      deleteFolder: deleteFolder,
+      uploadDirectory: jest.fn().mockImplementation(() => {
+        return [{ name: "test.js" }]
+      }),
+      deleteFolder: jest.fn().mockImplementation(),
     },
   }
 })
 
-import { events } from "@budibase/backend-core"
+import { events, objectStore } from "@budibase/backend-core"
 import * as setup from "./utilities"
 
+const mockUploadDirectory = objectStore.uploadDirectory as jest.Mock
+const mockDeleteFolder = objectStore.deleteFolder as jest.Mock
+
 describe("/plugins", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -57,7 +57,7 @@ describe("/plugins", () => {
     })
 
     it("should not be able to create a plugin if there is an error", async () => {
-      mockObjectStore.mockImplementationOnce(() => {
+      mockUploadDirectory.mockImplementationOnce(() => {
         throw new Error()
       })
       let res = await createPlugin(400)
@@ -92,7 +92,7 @@ describe("/plugins", () => {
       expect(events.plugin.deleted).toHaveBeenCalledTimes(1)
     })
     it("should handle an error deleting a plugin", async () => {
-      deleteFolder.mockImplementationOnce(() => {
+      mockDeleteFolder.mockImplementationOnce(() => {
         throw new Error()
       })
 

package/src/api/routes/tests/user.spec.js

@@ -171,9 +171,28 @@ describe("/users", () => {
         .expect("Content-Type", /json/)
       expect(res.body.message).toEqual('User synced.')
     })
-  })
 
 
+    it("should sync the user when a previous user is specified", async () => {
+      const app1 = await config.createApp('App 1')
+      const app2 = await config.createApp('App 2')
 
+      let user = await config.createUser(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        false,
+        true,
+        { [app1.appId]: 'ADMIN' })
+      let res = await request
+        .post(`/api/users/metadata/sync/${user._id}`)
+        .set(config.defaultHeaders())
+        .send({ previousUser: { ...user, roles: { ...user.roles, [app2.appId]: 'BASIC' } } })
+        .expect(200)
+        .expect("Content-Type", /json/)
 
+      expect(res.body.message).toEqual('User synced.')
+    })
+  })
 })

package/src/api/routes/tests/utilities/TestFunctions.ts

@@ -3,7 +3,7 @@ import * as appController from "../../../controllers/application"
 import { AppStatus } from "../../../../db/utils"
 import { roles, tenancy, context } from "@budibase/backend-core"
 import { TENANT_ID } from "../../../../tests/utilities/structures"
-import * as env from "../../../../environment"
+import env from "../../../../environment"
 
 class Request {
   appId: any

package/src/api/routes/user.ts

@@ -48,4 +48,4 @@ router
     controller.getFlags
   )
 
-export = router
+export default router

package/src/api/routes/view.ts

@@ -31,4 +31,4 @@ router
   )
   .post("/api/views", authorized(permissions.BUILDER), viewController.save)
 
-export = router
+export default router

package/src/api/routes/webhook.ts

@@ -24,4 +24,4 @@ router
   // this shouldn't have authorisation, right now its always public
   .post("/api/webhooks/trigger/:instance/:id", controller.trigger)
 
-export = router
+export default router

package/src/app.ts

@@ -1,5 +1,5 @@
 // need to load environment first
-import * as env from "./environment"
+import env from "./environment"
 
 // enable APM if configured
 if (process.env.ELASTIC_APM_ENABLED) {
@@ -19,7 +19,7 @@ import * as api from "./api"
 import * as automations from "./automations"
 import { Thread } from "./threads"
 import * as redis from "./utilities/redis"
-import { events, logging } from "@budibase/backend-core"
+import { events, logging, middleware } from "@budibase/backend-core"
 import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 const Sentry = require("@sentry/node")
@@ -40,6 +40,8 @@ app.use(
   })
 )
 
+app.use(middleware.logging)
+
 if (env.isProd()) {
   env._set("NODE_ENV", "production")
   Sentry.init()
@@ -77,7 +79,7 @@ server.on("close", async () => {
   }
 })
 
-export = server.listen(env.PORT || 0, async () => {
+export default server.listen(env.PORT || 0, async () => {
   await startup(app, server)
 })