@budibase/worker 2.2.12-alpha.3 → 2.2.12-alpha.31

package/jest.config.ts

@@ -2,11 +2,14 @@ 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}"],
   coverageReporters: ["lcov", "json", "clover"],
+  transform: {
+    "^.+\\.ts?$": "@swc/jest",
+  },
 }
 
 if (!process.env.CI) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.3",
+  "version": "2.2.12-alpha.31",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.2.12-alpha.3",
-    "@budibase/pro": "2.2.12-alpha.2",
-    "@budibase/string-templates": "2.2.12-alpha.3",
-    "@budibase/types": "2.2.12-alpha.3",
+    "@budibase/backend-core": "2.2.12-alpha.31",
+    "@budibase/pro": "2.2.12-alpha.30",
+    "@budibase/string-templates": "2.2.12-alpha.31",
+    "@budibase/types": "2.2.12-alpha.31",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -70,6 +70,8 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
     "@types/jest": "26.0.23",
     "@types/jsonwebtoken": "8.5.1",
     "@types/koa": "2.13.4",
@@ -95,5 +97,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "55f2a50064a4670de13e964f3b40c9f05189c5d6"
+  "gitHead": "f06b539fceaa40c8e8e95d206212b3fc41989cff"
 }

package/src/api/controllers/global/auth.ts

@@ -13,7 +13,7 @@ import { isEmailConfigured, sendEmail } from "../../../utilities/email"
 import { checkResetPasswordCode } from "../../../utilities/redis"
 import env from "../../../environment"
 import sdk from "../../../sdk"
-import { Config, ConfigType, User } from "@budibase/types"
+import { ConfigType, User } from "@budibase/types"
 
 const { setCookie, getCookie, clearCookie, hash, platformLogout } = utils
 const { Cookie, Header } = constants

package/src/api/routes/global/auth.ts

@@ -85,4 +85,4 @@ router
   .get("/api/global/auth/oidc/callback", authController.oidcAuth)
   .get("/api/admin/auth/oidc/callback", authController.oidcAuth)
 
-export = router
+export default router

package/src/api/routes/global/configs.ts

@@ -34,8 +34,8 @@ function settingValidation() {
 function googleValidation() {
   // prettier-ignore
   return Joi.object({
-    clientID: Joi.string().required(),
-    clientSecret: Joi.string().required(),
+    clientID: Joi.when('activated', { is: true, then: Joi.string().required() }),
+    clientSecret: Joi.when('activated', { is: true, then: Joi.string().required() }),
     activated: Joi.boolean().required(),
   }).unknown(true)
 }
@@ -45,12 +45,12 @@ function oidcValidation() {
   return Joi.object({
     configs: Joi.array().items(
       Joi.object({
-        clientID: Joi.string().required(),
-        clientSecret: Joi.string().required(),
-        configUrl: Joi.string().required(),
+        clientID: Joi.when('activated', { is: true, then: Joi.string().required() }),
+        clientSecret: Joi.when('activated', { is: true, then: Joi.string().required() }),
+        configUrl: Joi.when('activated', { is: true, then: Joi.string().required() }),
         logo: Joi.string().allow("", null),
         name: Joi.string().allow("", null),
-        uuid: Joi.string().required(),
+        uuid: Joi.when('activated', { is: true, then: Joi.string().required() }),
         activated: Joi.boolean().required(),
         scopes: Joi.array().optional()
       })
@@ -121,4 +121,4 @@ router
     controller.upload
   )
 
-export = router
+export default router

package/src/api/routes/global/email.ts

@@ -33,4 +33,4 @@ router.post(
   controller.sendEmail
 )
 
-export = router
+export default router

package/src/api/routes/global/roles.ts

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

package/src/api/routes/global/self.ts

@@ -15,4 +15,4 @@ router
     controller.updateSelf
   )
 
-export = router
+export default router

package/src/api/routes/global/templates.ts

@@ -34,4 +34,4 @@ router
   .get("/api/global/template/:id", controller.find)
   .delete("/api/global/template/:id/:rev", adminOnly, controller.destroy)
 
-export = router
+export default router

package/src/api/routes/global/tests/templates.spec.ts

@@ -1,17 +1,9 @@
-import {
-  addBaseTemplates,
-  EmailTemplates,
-  getTemplates,
-} from "../../../../constants/templates"
 import {
   EmailTemplatePurpose,
   TemplateMetadata,
-  TemplateMetadataNames,
   TemplateType,
 } from "../../../../constants"
 import { TestConfiguration } from "../../../../tests"
-import { join } from "path"
-import { readStaticFile } from "../../../../../src/utilities/fileSystem"
 
 // TODO
 

package/src/api/routes/global/users.ts

@@ -113,4 +113,4 @@ router
     selfController.updateSelf
   )
 
-export = router
+export default router

package/src/api/routes/global/workspaces.ts

@@ -34,4 +34,4 @@ router
   .get("/api/global/workspaces", controller.fetch)
   .get("/api/global/workspaces/:id", controller.find)
 
-export = router
+export default router

package/src/api/routes/system/accounts.ts

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

package/src/api/routes/system/environment.ts

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

package/src/api/routes/system/migrations.ts

@@ -16,4 +16,4 @@ router
     migrationsController.fetchDefinitions
   )
 
-export = router
+export default router

package/src/api/routes/system/restore.ts

@@ -5,4 +5,4 @@ const router: Router = new Router()
 
 router.post("/api/system/restored", controller.systemRestored)
 
-export = router
+export default router

package/src/api/routes/system/status.ts

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

package/src/api/routes/system/tenants.ts

@@ -10,4 +10,4 @@ router.delete(
   controller.delete
 )
 
-export = router
+export default router

package/src/api/routes/system/tests/environment.spec.ts

@@ -20,7 +20,7 @@ describe("/api/system/environment", () => {
       const env = await config.api.environment.getEnvironment()
       expect(env.body).toEqual({
         cloud: true,
-        disableAccountPortal: false,
+        disableAccountPortal: 0,
         isDev: false,
         multiTenancy: true,
       })

package/src/db/index.ts

@@ -1,4 +1,4 @@
-import core from "@budibase/backend-core"
+import * as core from "@budibase/backend-core"
 import env from "../environment"
 
 export const init = () => {

package/src/environment.ts

@@ -98,4 +98,4 @@ for (let [key, value] of Object.entries(environment)) {
   }
 }
 
-export = environment
+export default environment

package/src/index.ts

@@ -14,7 +14,7 @@ import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
-import { auth, logging, events, pinoSettings } from "@budibase/backend-core"
+import { auth, logging, events, middleware } from "@budibase/backend-core"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -36,7 +36,8 @@ app.keys = ["secret", "key"]
 // set up top level koa middleware
 app.use(koaBody({ multipart: true }))
 app.use(koaSession(app))
-app.use(logger(pinoSettings()))
+app.use(middleware.logging)
+app.use(logger(logging.pinoSettings()))
 
 // authentication
 app.use(auth.passport.initialize())
@@ -82,7 +83,7 @@ const shutdown = () => {
   server.destroy()
 }
 
-export = server.listen(parseInt(env.PORT || "4002"), async () => {
+export default server.listen(parseInt(env.PORT || "4002"), async () => {
   console.log(`Worker running on ${JSON.stringify(server.address())}`)
   await redis.init()
 })

package/src/middleware/cloudRestricted.ts

@@ -6,7 +6,7 @@ import { BBContext } from "@budibase/types"
  * This is a restricted endpoint in the cloud.
  * Ensure that the correct API key has been supplied.
  */
-export = async (ctx: BBContext, next: any) => {
+export default async (ctx: BBContext, next: any) => {
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
     const apiKey = ctx.request.headers[constants.Header.API_KEY]
     if (apiKey !== env.INTERNAL_API_KEY) {

package/src/sdk/users/users.ts

@@ -31,6 +31,7 @@ import {
   SearchUsersRequest,
   User,
   ThirdPartyUser,
+  isUser,
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
 import { EmailTemplatePurpose } from "../../constants"
@@ -265,8 +266,9 @@ export const save = async (
     await eventHelpers.handleSaveEvents(builtUser, dbUser)
     await addTenant(tenantId, _id, email)
     await cache.user.invalidateUser(response.id)
+
     // let server know to sync user
-    await apps.syncUserInApps(_id)
+    await apps.syncUserInApps(_id, dbUser)
 
     await Promise.all(groupPromises)
 
@@ -572,7 +574,7 @@ export const destroy = async (id: string, currentUser: any) => {
   await cache.user.invalidateUser(userId)
   await sessions.invalidateSessions(userId, { reason: "deletion" })
   // let server know to sync user
-  await apps.syncUserInApps(userId)
+  await apps.syncUserInApps(userId, dbUser)
 }
 
 const bulkDeleteProcessing = async (dbUser: User) => {
@@ -582,7 +584,7 @@ const bulkDeleteProcessing = async (dbUser: User) => {
   await cache.user.invalidateUser(userId)
   await sessions.invalidateSessions(userId, { reason: "bulk-deletion" })
   // let server know to sync user
-  await apps.syncUserInApps(userId)
+  await apps.syncUserInApps(userId, dbUser)
 }
 
 export const invite = async (

package/src/tests/TestConfiguration.ts

@@ -51,7 +51,7 @@ class TestConfiguration {
 
     if (opts.openServer) {
       env.PORT = "0" // random port
-      this.server = require("../index")
+      this.server = require("../index").default
       // we need the request for logging in, involves cookies, hard to fake
       this.request = supertest(this.server)
     }
@@ -327,4 +327,4 @@ class TestConfiguration {
   }
 }
 
-export = TestConfiguration
+export default TestConfiguration

package/src/tests/api/users.ts

@@ -5,7 +5,7 @@ import {
   User,
   CreateAdminUserRequest,
 } from "@budibase/types"
-import * as structures from "../structures"
+import structures from "../structures"
 import { generator } from "@budibase/backend-core/tests"
 import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"

package/src/tests/index.ts

@@ -1,18 +1,6 @@
-import mocks from "./mocks"
-import { generator } from "@budibase/backend-core/tests"
-import TestConfiguration from "./TestConfiguration"
-import structures from "./structures"
-import API from "./api"
-import { v4 as uuid } from "uuid"
-
-const pkg = {
-  structures,
-  generator,
-  uuid,
-  TENANT_1: structures.TENANT_1,
-  mocks,
-  TestConfiguration,
-  API,
-}
-
-export = pkg
+export { default as mocks } from "./mocks"
+export { generator } from "@budibase/backend-core/tests"
+export { default as TestConfiguration } from "./TestConfiguration"
+export { default as structures } from "./structures"
+export { default as API } from "./api"
+export { v4 as uuid } from "uuid"

package/src/tests/jestEnv.ts

@@ -0,0 +1,11 @@
+process.env.SELF_HOSTED = "0"
+process.env.NODE_ENV = "jest"
+process.env.JWT_SECRET = "test-jwtsecret"
+process.env.LOG_LEVEL = "silent"
+process.env.MULTI_TENANCY = "1"
+process.env.MINIO_URL = "http://localhost"
+process.env.MINIO_ACCESS_KEY = "test"
+process.env.MINIO_SECRET_KEY = "test"
+process.env.PLATFORM_URL = "http://localhost:10000"
+process.env.INTERNAL_API_KEY = "tet"
+process.env.DISABLE_ACCOUNT_PORTAL = "0"

package/src/tests/jestSetup.ts

@@ -1,17 +1,3 @@
-import env from "../environment"
-
-env._set("SELF_HOSTED", "0")
-env._set("NODE_ENV", "jest")
-env._set("JWT_SECRET", "test-jwtsecret")
-env._set("LOG_LEVEL", "silent")
-env._set("MULTI_TENANCY", true)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")
-env._set("PLATFORM_URL", "http://localhost:10000")
-env._set("INTERNAL_API_KEY", "test")
-env._set("DISABLE_ACCOUNT_PORTAL", false)
-
 import { mocks } from "@budibase/backend-core/tests"
 
 // must explicitly enable fetch mock

package/src/tests/mocks/index.ts

@@ -1,7 +1,7 @@
 import * as email from "./email"
 import { mocks } from "@budibase/backend-core/tests"
 
-export = {
+export default {
   email,
   ...mocks,
 }

package/src/tests/structures/index.ts

@@ -4,9 +4,9 @@ import * as users from "./users"
 import * as groups from "./groups"
 import { v4 as uuid } from "uuid"
 
-const TENANT_ID = "default"
-const TENANT_1 = "tenant1"
-const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
+export const TENANT_ID = "default"
+export const TENANT_1 = "tenant1"
+export const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 const pkg = {
   ...structures,
@@ -19,4 +19,4 @@ const pkg = {
   groups,
 }
 
-export = pkg
+export default pkg

package/src/utilities/appService.ts

@@ -1,7 +1,8 @@
 import fetch from "node-fetch"
-import { constants, tenancy } from "@budibase/backend-core"
+import { constants, tenancy, logging } from "@budibase/backend-core"
 import { checkSlashesInUrl } from "../utilities"
 import env from "../environment"
+import { SyncUserRequest, User } from "@budibase/types"
 
 async function makeAppRequest(url: string, method: string, body: any) {
   if (env.isTest()) {
@@ -17,14 +18,22 @@ async function makeAppRequest(url: string, method: string, body: any) {
     request.body = JSON.stringify(body)
   }
   request.method = method
+
+  // add x-budibase-correlation-id header
+  logging.correlation.setHeader(request.headers)
+
   return fetch(checkSlashesInUrl(env.APPS_URL + url), request)
 }
 
-export async function syncUserInApps(userId: string) {
+export async function syncUserInApps(userId: string, previousUser?: User) {
+  const body: SyncUserRequest = {
+    previousUser,
+  }
+
   const response = await makeAppRequest(
     `/api/users/metadata/sync/${userId}`,
     "POST",
-    {}
+    body
   )
   if (response && response.status !== 200) {
     throw "Unable to sync user."