@budibase/worker 2.8.29-alpha.5 → 2.8.30

package/jest.config.ts

@@ -1,7 +1,9 @@
 import { Config } from "@jest/types"
 import * as fs from "fs"
+const preset = require("ts-jest/jest-preset")
 
 const config: Config.InitialOptions = {
+  ...preset,
   preset: "@trendyol/jest-testcontainers",
   setupFiles: ["./src/tests/jestEnv.ts"],
   setupFilesAfterEnv: ["./src/tests/jestSetup.ts"],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.8.29-alpha.5",
+  "version": "2.8.30",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -38,10 +38,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.8.29-alpha.5",
-    "@budibase/pro": "2.8.29-alpha.5",
-    "@budibase/string-templates": "2.8.29-alpha.5",
-    "@budibase/types": "2.8.29-alpha.5",
+    "@budibase/backend-core": "2.8.30",
+    "@budibase/pro": "2.8.30",
+    "@budibase/string-templates": "2.8.30",
+    "@budibase/types": "2.8.30",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -74,10 +74,10 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@swc/core": "1.3.71",
-    "@swc/jest": "0.2.27",
-    "@trendyol/jest-testcontainers": "2.1.1",
-    "@types/jest": "29.5.3",
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
+    "@trendyol/jest-testcontainers": "^2.1.1",
+    "@types/jest": "28.1.1",
     "@types/jsonwebtoken": "8.5.1",
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.8",
@@ -91,13 +91,14 @@
     "@typescript-eslint/parser": "5.45.0",
     "copyfiles": "2.4.1",
     "eslint": "6.8.0",
-    "jest": "29.6.2",
+    "jest": "28.1.1",
     "lodash": "4.17.21",
     "nodemon": "2.0.15",
     "pouchdb-adapter-memory": "7.2.2",
     "rimraf": "3.0.2",
     "supertest": "6.2.2",
     "timekeeper": "2.2.0",
+    "ts-jest": "28.0.4",
     "ts-node": "10.8.1",
     "tsconfig-paths": "4.0.0",
     "typescript": "4.7.3",
@@ -117,5 +118,5 @@
       }
     }
   },
-  "gitHead": "51a46a236606dfc158218904951ff776994d9e5b"
+  "gitHead": "0bb17a32b1120c5b2526983870dbec4ee8cd6086"
 }

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

@@ -507,17 +507,17 @@ export async function configChecklist(ctx: Ctx) {
           smtp: {
             checked: !!smtpConfig,
             label: "Set up email",
-            link: "/builder/portal/settings/email",
+            link: "/builder/portal/manage/email",
           },
           adminUser: {
             checked: userExists,
             label: "Create your first user",
-            link: "/builder/portal/users/users",
+            link: "/builder/portal/manage/users",
           },
           sso: {
             checked: !!googleConfig || !!oidcConfig,
             label: "Set up single sign-on",
-            link: "/builder/portal/settings/auth",
+            link: "/builder/portal/manage/auth",
           },
         }
       }

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

@@ -1,6 +1,6 @@
 import { sendEmail as sendEmailFn } from "../../../utilities/email"
 import { tenancy } from "@budibase/backend-core"
-import { BBContext, User } from "@budibase/types"
+import { BBContext } from "@budibase/types"
 
 export async function sendEmail(ctx: BBContext) {
   let {
@@ -16,10 +16,10 @@ export async function sendEmail(ctx: BBContext) {
     automation,
     invite,
   } = ctx.request.body
-  let user: any
+  let user
   if (userId) {
     const db = tenancy.getGlobalDB()
-    user = await db.get<User>(userId)
+    user = await db.get(userId)
   }
   const response = await sendEmailFn(email, purpose, {
     workspaceId,

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

@@ -35,7 +35,7 @@ export async function find(ctx: BBContext) {
   const appId = ctx.params.appId
   await context.doInAppContext(dbCore.getDevAppID(appId), async () => {
     const db = context.getAppDB()
-    const app = await db.get<App>(dbCore.DocumentType.APP_METADATA)
+    const app = await db.get(dbCore.DocumentType.APP_METADATA)
     ctx.body = {
       roles: await roles.getAllRoles(),
       name: app.name,

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

@@ -44,7 +44,7 @@ export async function generateAPIKey(ctx: any) {
   const id = dbCore.generateDevInfoID(userId)
   let devInfo
   try {
-    devInfo = await db.get<any>(id)
+    devInfo = await db.get(id)
   } catch (err) {
     devInfo = { _id: id, userId }
   }

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

@@ -412,7 +412,7 @@ export const inviteAccept = async (
 
       const saved = await userSdk.save(request)
       const db = tenancy.getGlobalDB()
-      const user = await db.get<User>(saved._id)
+      const user = await db.get(saved._id)
       await events.user.inviteAccepted(user)
       return saved
     })

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

@@ -314,7 +314,7 @@ describe("scim", () => {
 
           const user = await config.getUser(email)
           expect(user).toBeDefined()
-          expect(user!.email).toEqual(email)
+          expect(user.email).toEqual(email)
         })
 
         it("if multiple emails are provided, the first primary one is used as email", async () => {
@@ -345,7 +345,7 @@ describe("scim", () => {
 
           const user = await config.getUser(email)
           expect(user).toBeDefined()
-          expect(user!.email).toEqual(email)
+          expect(user.email).toEqual(email)
         })
 
         it("if no email is provided and the user name is not an email, an exception is thrown", async () => {

package/src/api/routes/index.ts

@@ -16,9 +16,6 @@ import licenseRoutes from "./global/license"
 import migrationRoutes from "./system/migrations"
 import accountRoutes from "./system/accounts"
 import restoreRoutes from "./system/restore"
-import systemLogRoutes from "./system/logs"
-
-import env from "../../environment"
 
 export const routes: Router[] = [
   configRoutes,
@@ -41,7 +38,3 @@ export const routes: Router[] = [
   eventRoutes,
   pro.scim,
 ]
-
-if (env.SELF_HOSTED) {
-  routes.push(systemLogRoutes)
-}

package/src/api/controllers/system/logs.ts

@@ -1,13 +0,0 @@
-import { UserCtx } from "@budibase/types"
-import { installation, logging } from "@budibase/backend-core"
-
-export async function getLogs(ctx: UserCtx) {
-  const logReadStream = logging.system.getLogReadStream()
-
-  const { installId } = await installation.getInstall()
-
-  const fileName = `${installId}-${Date.now()}.log`
-
-  ctx.set("content-disposition", `attachment; filename=${fileName}`)
-  ctx.body = logReadStream
-}

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

@@ -1,9 +0,0 @@
-import Router from "@koa/router"
-import { middleware } from "@budibase/backend-core"
-import * as controller from "../../controllers/system/logs"
-
-const router: Router = new Router()
-
-router.get("/api/system/logs", middleware.adminOnly, controller.getLogs)
-
-export default router