@budibase/server 3.26.2 → 3.26.3

package/dist/yarn.lock

@@ -4589,15 +4589,15 @@
   dependencies:
     vary "^1.1.2"
 
-"@koa/router@15.3.0":
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-15.3.0.tgz#bb58f1f664ade3ac01cd0884391c0a11655b5291"
-  integrity sha512-s87hWJjFYky2Z97u8jzah73sSHp4IZivD/2PZCuspHRvcKU69OPLoBIbKigVlBmS50yFTh9GHFfr1hDag4+wXw==
+"@koa/router@13.1.1":
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/@koa/router/-/router-13.1.1.tgz#1291b8adca7f61a31a7f8974d28654654211469d"
+  integrity sha512-JQEuMANYRVHs7lm7KY9PCIjkgJk73h4m4J+g2mkw2Vo1ugPZ17UJVqEH8F+HeAdjKz5do1OaLe7ArDz+z308gw==
   dependencies:
-    debug "^4.4.3"
-    http-errors "^2.0.1"
+    debug "^4.4.1"
+    http-errors "^2.0.0"
     koa-compose "^4.1.0"
-    path-to-regexp "^8.3.0"
+    path-to-regexp "^6.3.0"
 
 "@lerna/create@9.0.3":
   version "9.0.3"
@@ -7764,10 +7764,10 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa__router@12.0.5":
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-12.0.5.tgz#4eaab7cf650bea292ae02787d9e1e6b77a31f191"
-  integrity sha512-1HeLxuDn4n5it1yZYCSyOYXo++73zT0ffoviXnPxbwbxLbvDFEvWD9ZzpRiIpK4oKR0pi+K+Mk/ZjyROjW3HSw==
+"@types/koa__router@12.0.4":
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-12.0.4.tgz#a1f9afec9dc7e7d9fa1252d1938c44b403e19a28"
+  integrity sha512-Y7YBbSmfXZpa/m5UGGzb7XadJIRBRnwNY9cdAojZGp65Cpe5MAP3mOZE7e3bImt8dfKS4UFcR16SLH8L/z7PBw==
   dependencies:
     "@types/koa" "*"
 
@@ -14634,7 +14634,7 @@ http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.1"
 
-http-errors@^2.0.1:
+http-errors@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
   integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
@@ -19568,16 +19568,11 @@ path-to-regexp@0.1.12, path-to-regexp@^0.1.12:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
   integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
-path-to-regexp@^6.1.0:
+path-to-regexp@^6.1.0, path-to-regexp@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.3.0.tgz#2b6a26a337737a8e1416f9272ed0766b1c0389f4"
   integrity sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==
 
-path-to-regexp@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
-  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "3.26.2",
+  "version": "3.26.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -61,7 +61,7 @@
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "7.8.0",
     "@koa/cors": "5.0.0",
-    "@koa/router": "15.3.0",
+    "@koa/router": "13.1.1",
     "@octokit/rest": "^20.0.0",
     "@socket.io/redis-adapter": "^8.2.1",
     "@types/xml2js": "^0.4.14",
@@ -148,6 +148,7 @@
     "@types/koa": "2.13.4",
     "@types/koa-send": "^4.1.6",
     "@types/koa__cors": "5.0.0",
+    "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
     "@types/mailparser": "^3.4.6",
     "@types/mssql": "9.1.5",
@@ -225,5 +226,5 @@
       }
     }
   },
-  "gitHead": "908ec20f1124a11b0cbe3bed8d2bc4a04e856cfe"
+  "gitHead": "69ab5e17bf9ccdac19b3bccd30352b936942129a"
 }

package/src/api/controllers/assets.ts

@@ -8,6 +8,5 @@ import send from "koa-send"
 export const serveBuilderAssets = async function (ctx: Ctx<void, void>) {
   let topLevelPath = env.isDev() ? DEV_ASSET_PATH : TOP_LEVEL_PATH
   const builderPath = join(topLevelPath, "builder")
-  const file = ctx.file || "index.html"
-  await send(ctx, file, { root: builderPath })
+  await send(ctx, ctx.file, { root: builderPath })
 }

package/src/api/controllers/dev.ts

@@ -17,9 +17,7 @@ async function redirect(
   method: "GET" | "POST" | "DELETE",
   path = "global"
 ) {
-  const devPath = Array.isArray(ctx.params.devPath)
-    ? ctx.params.devPath.join("/")
-    : ctx.params.devPath
+  const { devPath } = ctx.params
   const queryString = ctx.originalUrl.split("?")[1] || ""
   const response = await fetch(
     checkSlashesInUrl(

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

@@ -406,9 +406,7 @@ export const serveClientLibrary = async function (
 }
 
 export const serve3rdPartyFile = async function (ctx: Ctx) {
-  const file = Array.isArray(ctx.params.file)
-    ? ctx.params.file.join("/")
-    : ctx.params.file
+  const { file } = ctx.params
 
   const workspaceId = context.getWorkspaceId()
   if (!workspaceId) {

package/src/api/routes/assets.ts

@@ -6,7 +6,6 @@ const router: Router = new Router()
 
 addFileManagement(router)
 
-router.get("/builder", serveBuilderAssets)
-router.get("/builder/*file", serveBuilderAssets)
+router.get("/builder/:file*", serveBuilderAssets)
 
 export default router

package/src/api/routes/dev.ts

@@ -4,9 +4,9 @@ import { builderRoutes, publicRoutes } from "./endpointGroups"
 
 function redirectPath(path: string) {
   publicRoutes
-    .get(`/api/${path}/*devPath`, controller.buildRedirectGet(path))
-    .post(`/api/${path}/*devPath`, controller.buildRedirectPost(path))
-    .delete(`/api/${path}/*devPath`, controller.buildRedirectDelete(path))
+    .get(`/api/${path}/:devPath(.*)`, controller.buildRedirectGet(path))
+    .post(`/api/${path}/:devPath(.*)`, controller.buildRedirectPost(path))
+    .delete(`/api/${path}/:devPath(.*)`, controller.buildRedirectDelete(path))
 }
 
 if (env.isDev() || env.isTest()) {

package/src/api/routes/static.ts

@@ -18,7 +18,7 @@ router
     ctx.redirect("/builder/bblogo.png")
   })
   .get("/api/assets/:appId/client", controller.serveClientLibrary)
-  .get("/api/assets/:appId/*file", controller.serve3rdPartyFile)
+  .get("/api/assets/:appId/:file(.*)", controller.serve3rdPartyFile)
   .get("/api/apps/:appId/manifest.json", controller.servePwaManifest)
   .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
   .post("/api/pwa/process-zip", authorized(BUILDER), controller.processPWAZip)
@@ -35,10 +35,8 @@ router
     controller.serveBuilderPreview
   )
   .get("/app/service-worker.js", controller.serveServiceWorker)
-  .get("/app/:appUrl", controller.serveApp)
-  .get("/app/:appUrl/*path", controller.serveApp)
-  .get(`/${devAppIdPath}`, controller.serveApp)
-  .get(`/${devAppIdPath}/*path`, controller.serveApp)
+  .get("/app/:appUrl/:path*", controller.serveApp)
+  .get(`/${devAppIdPath}/:path*`, controller.serveApp)
   .post(
     "/api/attachments/:datasourceId/url",
     recaptcha,

package/src/api/utils.ts

@@ -6,11 +6,7 @@ import Router from "@koa/router"
 export function addFileManagement(router: Router) {
   /* istanbul ignore next */
   router.param("file", async (file: any, ctx: any, next: () => void) => {
-    const normalizedFile = Array.isArray(file) ? file.join("/") : file
-    ctx.file =
-      normalizedFile && normalizedFile.includes(".")
-        ? normalizedFile
-        : "index.html"
+    ctx.file = file && file.includes(".") ? file : "index.html"
     if (!ctx.file.startsWith("budibase-client")) {
       return next()
     }

package/src/constants/paths.ts

@@ -1,3 +1,3 @@
 import { DocumentType } from "@budibase/types"
 
-export const devAppIdPath = `${DocumentType.WORKSPACE_DEV}_:appId`
+export const devAppIdPath = `:appId(${DocumentType.WORKSPACE_DEV}_.+)`