@budibase/worker 3.34.2 → 3.34.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.34.2",
+  "version": "3.34.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -49,8 +49,8 @@
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.2",
     "knex": "2.4.2",
-    "koa": "2.15.4",
-    "koa-body": "4.2.0",
+    "koa": "3.1.2",
+    "koa-body": "7.0.1",
     "koa-compress": "4.0.1",
     "koa-passport": "4.1.4",
     "koa-redis": "^4.0.1",
@@ -91,5 +91,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "gitHead": "4d4c308333cb78bd5454f322f983dc0da62e5505"
+  "gitHead": "374da6efdde7455de279a8cdfda9d5662db9cb46"
 }

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

@@ -382,7 +382,7 @@ export async function save(
         break
     }
   } catch (err: any) {
-    ctx.throw(400, err)
+    ctx.throw(400, err?.message || err)
   }
 
   // Ignore branding changes if the license does not permit it
@@ -431,7 +431,7 @@ export async function save(
       _rev: response.rev,
     }
   } catch (err: any) {
-    ctx.throw(400, err)
+    ctx.throw(400, err?.message || err)
   }
 }
 
@@ -531,7 +531,7 @@ export async function publicOidc(ctx: Ctx<void, GetPublicOIDCConfigResponse>) {
       ]
     }
   } catch (err: any) {
-    ctx.throw(err.status, err)
+    ctx.throw(err.status, err?.message || err)
   }
 }
 
@@ -625,7 +625,7 @@ export async function publicSettings(
       },
     }
   } catch (err: any) {
-    ctx.throw(err.status, err)
+    ctx.throw(err.status, err?.message || err)
   }
 }
 
@@ -636,7 +636,7 @@ export async function publicTranslations(
     const configDoc = await configs.getTranslationsConfigDoc()
     ctx.body = filterPublicTranslations(configDoc.config)
   } catch (err: any) {
-    ctx.throw(err.status, err)
+    ctx.throw(err.status, err?.message || err)
   }
 }
 
@@ -693,7 +693,7 @@ export async function destroy(ctx: UserCtx<void, DeleteConfigResponse>) {
     await cache.destroy(cache.CacheKey.CHECKLIST)
     ctx.body = { message: "Config deleted successfully" }
   } catch (err: any) {
-    ctx.throw(err.status, err)
+    ctx.throw(err.status, err?.message || err)
   }
 }
 
@@ -758,6 +758,6 @@ export async function configChecklist(ctx: Ctx<void, ConfigChecklistResponse>) {
       }
     )
   } catch (err: any) {
-    ctx.throw(err.status, err)
+    ctx.throw(err.status, err?.message || err)
   }
 }

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

@@ -112,7 +112,7 @@ export const save = async (ctx: UserCtx<UnsavedUser, SaveUserResponse>) => {
       email: user.email,
     }
   } catch (err: any) {
-    ctx.throw(err.status || 400, err)
+    ctx.throw(err.status || 400, err?.message || err)
   }
 }
 
@@ -146,7 +146,7 @@ export const changeTenantOwnerEmail = async (
     }
     ctx.status = 200
   } catch (err: any) {
-    ctx.throw(err.status || 400, err)
+    ctx.throw(err.status || 400, err?.message || err)
   }
 }
 
@@ -178,7 +178,7 @@ export const addSsoSupport = async (
     })
     ctx.body = { message: "SSO support added." }
   } catch (err: any) {
-    ctx.throw(err.status || 400, err)
+    ctx.throw(err.status || 400, err?.message || err)
   }
 }
 
@@ -271,7 +271,7 @@ export const adminUser = async (
         email: finalUser.email,
       }
     } catch (err: any) {
-      ctx.throw(err.status || 400, err)
+      ctx.throw(err.status || 400, err?.message || err)
     }
   })
 }
@@ -283,7 +283,7 @@ export const countByWorkspace = async (
   try {
     ctx.body = await userSdk.db.countUsersByWorkspace(workspaceId)
   } catch (err: any) {
-    ctx.throw(err.status || 400, err)
+    ctx.throw(err.status || 400, err?.message || err)
   }
 }
 
@@ -848,10 +848,13 @@ export const inviteAccept = async (
   } catch (err: any) {
     if (err.code === APIWarningCode.USAGE_LIMIT_EXCEEDED) {
       // explicitly re-throw limit exceeded errors
-      ctx.throw(400, err)
+      ctx.throw(400, err?.message || err)
     }
     console.warn("Error inviting user", err)
-    ctx.throw(400, err || "Unable to create new user, invitation invalid.")
+    ctx.throw(
+      400,
+      err?.message || err || "Unable to create new user, invitation invalid."
+    )
   }
 }
 

package/src/index.ts

@@ -20,7 +20,7 @@ import { bootstrap } from "global-agent"
 import http from "http"
 import gracefulShutdown from "http-graceful-shutdown"
 import Application, { Middleware } from "koa"
-import koaBody from "koa-body"
+import koaBody, { HttpMethodEnum } from "koa-body"
 import RedisStore from "koa-redis"
 import api from "./api"
 import { loadTemplateConfig } from "./constants/templates"
@@ -55,7 +55,12 @@ app.use(handleScimBody)
 app.use(
   koaBody({
     multipart: true,
-    parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
+    parsedMethods: [
+      HttpMethodEnum.POST,
+      HttpMethodEnum.PUT,
+      HttpMethodEnum.PATCH,
+      HttpMethodEnum.DELETE,
+    ],
   })
 )