@budibase/worker 3.18.0 → 3.18.2

package/jest.config.ts

@@ -1,7 +1,7 @@
-import { Config } from "@jest/types"
+import { Config } from "jest"
 import * as fs from "fs"
 
-const config: Config.InitialOptions = {
+const config: Config = {
   globalSetup: "./../../globalSetup.ts",
   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": "3.18.0",
+  "version": "3.18.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -72,10 +72,6 @@
     "yaml": "^2.8.0"
   },
   "devDependencies": {
-    "@jest/types": "^29.6.3",
-    "@swc/core": "1.3.71",
-    "@swc/jest": "0.2.27",
-    "@types/jest": "29.5.5",
     "@types/jsonwebtoken": "9.0.3",
     "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
@@ -86,7 +82,6 @@
     "@types/supertest": "2.0.14",
     "@types/uuid": "8.3.4",
     "cheerio": "^1.0.0",
-    "jest": "29.7.0",
     "maildev": "^2.2.1",
     "nock": "^13.5.4",
     "nodemon": "2.0.15",
@@ -114,5 +109,5 @@
       }
     }
   },
-  "gitHead": "255f35eea6023bbc035d9dee8c56ba3e600c6b89"
+  "gitHead": "43d59f5579dd910575d8aebefb40fae25570c05d"
 }

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

@@ -673,7 +673,7 @@ export async function configChecklist(ctx: Ctx<void, ConfigChecklistResponse>) {
           apps: {
             checked: apps.length > 0,
             label: "Create your first app",
-            link: "/builder/portal/apps",
+            link: "/builder/portal/workspaces",
           },
           smtp: {
             checked: !!smtpConfig,

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

@@ -17,10 +17,14 @@ import nock from "nock"
 import * as jwt from "jsonwebtoken"
 
 function getAuthCookie(response: Response) {
-  return response.headers["set-cookie"]
-    .find((s: string) => s.startsWith(`${constants.Cookie.Auth}=`))
-    .split("=")[1]
-    .split(";")[0]
+  const cookies = response.headers["set-cookie"]
+  if (!cookies) throw new Error("No cookies found")
+  const cookieArray = Array.isArray(cookies) ? cookies : [cookies]
+  const authCookie = cookieArray.find((s: string) =>
+    s.startsWith(`${constants.Cookie.Auth}=`)
+  )
+  if (!authCookie) throw new Error("No auth cookie found")
+  return authCookie.split("=")[1].split(";")[0]
 }
 
 const expectSetAuthCookie = (response: Response) => {
@@ -302,9 +306,10 @@ describe("/api/global/auth", () => {
         const res = await config.api.configs.getOIDCConfig(configId)
 
         expect(res.status).toBe(302)
-        const location: string = res.get("location")
+        const location = res.get("location")
+        expect(location).toBeDefined()
         expect(
-          location.startsWith(
+          location!.startsWith(
             `http://example.com/auth?response_type=code&client_id=clientId&redirect_uri=http%3A%2F%2Flocalhost%3A10000%2Fapi%2Fglobal%2Fauth%2F${config.tenantId}%2Foidc%2Fcallback&scope=openid%20profile%20email%20offline_access`
           )
         ).toBe(true)
@@ -356,7 +361,7 @@ describe("/api/global/auth", () => {
         expect(events.auth.login).toHaveBeenCalledWith("oidc", email)
         expect(events.auth.login).toHaveBeenCalledTimes(1)
         expect(res.status).toBe(302)
-        const location: string = res.get("location")
+        const location = res.get("location")
         expect(location).toBe("/")
         expectSetAuthCookie(res)
       })