@budibase/backend-core 2.6.8-alpha.1 → 2.6.8-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.8-alpha.1",
+  "version": "2.6.8-alpha.12",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.6.8-alpha.1",
+    "@budibase/types": "2.6.8-alpha.12",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
@@ -88,5 +88,5 @@
     "tsconfig-paths": "4.0.0",
     "typescript": "4.7.3"
   },
-  "gitHead": "dd65dbb05ec06bc6e0f66b8faffe8de9beffa8fa"
+  "gitHead": "90d65824eb665b2b57181153a40fc140a607e7ff"
 }

package/src/constants/db.ts

@@ -21,7 +21,7 @@ export enum ViewName {
   AUTOMATION_LOGS = "automation_logs",
   ACCOUNT_BY_EMAIL = "account_by_email",
   PLATFORM_USERS_LOWERCASE = "platform_users_lowercase",
-  USER_BY_GROUP = "by_group_user",
+  USER_BY_GROUP = "user_by_group",
   APP_BACKUP_BY_TRIGGER = "by_trigger",
 }
 

package/src/utils/tests/utils.spec.ts

@@ -5,6 +5,7 @@ import * as db from "../../db"
 import { Header } from "../../constants"
 import { newid } from "../../utils"
 import env from "../../environment"
+import { BBContext } from "@budibase/types"
 
 describe("utils", () => {
   const config = new DBTestConfiguration()
@@ -106,4 +107,85 @@ describe("utils", () => {
       expect(actual).toBe(undefined)
     })
   })
+
+  describe("isServingBuilder", () => {
+    let ctx: BBContext
+
+    const expectResult = (result: boolean) =>
+      expect(utils.isServingBuilder(ctx)).toBe(result)
+
+    beforeEach(() => {
+      ctx = structures.koa.newContext()
+    })
+
+    it("returns true if current path is in builder", async () => {
+      ctx.path = "/builder/app/app_"
+      expectResult(true)
+    })
+
+    it("returns false if current path doesn't have '/' suffix", async () => {
+      ctx.path = "/builder/app"
+      expectResult(false)
+
+      ctx.path = "/xx"
+      expectResult(false)
+    })
+  })
+
+  describe("isServingBuilderPreview", () => {
+    let ctx: BBContext
+
+    const expectResult = (result: boolean) =>
+      expect(utils.isServingBuilderPreview(ctx)).toBe(result)
+
+    beforeEach(() => {
+      ctx = structures.koa.newContext()
+    })
+
+    it("returns true if current path is in builder preview", async () => {
+      ctx.path = "/app/preview/xx"
+      expectResult(true)
+    })
+
+    it("returns false if current path is not in builder preview", async () => {
+      ctx.path = "/builder"
+      expectResult(false)
+
+      ctx.path = "/xx"
+      expectResult(false)
+    })
+  })
+
+  describe("isPublicAPIRequest", () => {
+    let ctx: BBContext
+
+    const expectResult = (result: boolean) =>
+      expect(utils.isPublicApiRequest(ctx)).toBe(result)
+
+    beforeEach(() => {
+      ctx = structures.koa.newContext()
+    })
+
+    it("returns true if current path remains to public API", async () => {
+      ctx.path = "/api/public/v1/invoices"
+      expectResult(true)
+
+      ctx.path = "/api/public/v1"
+      expectResult(true)
+
+      ctx.path = "/api/public/v2"
+      expectResult(true)
+
+      ctx.path = "/api/public/v21"
+      expectResult(true)
+    })
+
+    it("returns false if current path doesn't remain to public API", async () => {
+      ctx.path = "/api/public"
+      expectResult(false)
+
+      ctx.path = "/xx"
+      expectResult(false)
+    })
+  })
 })

package/src/utils/utils.ts

@@ -1,11 +1,5 @@
-import { getAllApps, queryGlobalView } from "../db"
-import {
-  Header,
-  MAX_VALID_DATE,
-  DocumentType,
-  SEPARATOR,
-  ViewName,
-} from "../constants"
+import { getAllApps } from "../db"
+import { Header, MAX_VALID_DATE, DocumentType, SEPARATOR } from "../constants"
 import env from "../environment"
 import * as tenancy from "../tenancy"
 import * as context from "../context"
@@ -23,7 +17,9 @@ const APP_PREFIX = DocumentType.APP + SEPARATOR
 const PROD_APP_PREFIX = "/app/"
 
 const BUILDER_PREVIEW_PATH = "/app/preview"
-const BUILDER_REFERER_PREFIX = "/builder/app/"
+const BUILDER_PREFIX = "/builder"
+const BUILDER_APP_PREFIX = `${BUILDER_PREFIX}/app/`
+const PUBLIC_API_PREFIX = "/api/public/v"
 
 function confirmAppId(possibleAppId: string | undefined) {
   return possibleAppId && possibleAppId.startsWith(APP_PREFIX)
@@ -69,6 +65,18 @@ export function isServingApp(ctx: Ctx) {
   return false
 }
 
+export function isServingBuilder(ctx: Ctx): boolean {
+  return ctx.path.startsWith(BUILDER_APP_PREFIX)
+}
+
+export function isServingBuilderPreview(ctx: Ctx): boolean {
+  return ctx.path.startsWith(BUILDER_PREVIEW_PATH)
+}
+
+export function isPublicApiRequest(ctx: Ctx): boolean {
+  return ctx.path.startsWith(PUBLIC_API_PREFIX)
+}
+
 /**
  * Given a request tries to find the appId, which can be located in various places
  * @param {object} ctx The main request body to look through.
@@ -110,7 +118,7 @@ export async function getAppIdFromCtx(ctx: Ctx) {
   // make sure this is performed after prod app url resolution, in case the
   // referer header is present from a builder redirect
   const referer = ctx.request.headers.referer
-  if (!appId && referer?.includes(BUILDER_REFERER_PREFIX)) {
+  if (!appId && referer?.includes(BUILDER_APP_PREFIX)) {
     const refererId = parseAppIdFromUrl(ctx.request.headers.referer)
     appId = confirmAppId(refererId)
   }