@budibase/backend-core 2.5.8 → 2.5.10-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.8",
+  "version": "2.5.10-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.5.8",
+    "@budibase/types": "2.5.10-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
@@ -39,6 +39,7 @@
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.0",
     "koa-passport": "4.1.4",
+    "koa-pino-logger": "4.0.0",
     "lodash": "4.17.21",
     "lodash.isarguments": "3.1.0",
     "node-fetch": "2.6.7",
@@ -46,6 +47,8 @@
     "passport-jwt": "4.0.0",
     "passport-local": "1.0.0",
     "passport-oauth2-refresh": "^2.1.0",
+    "pino": "8.11.0",
+    "pino-http": "8.3.3",
     "posthog-node": "1.3.0",
     "pouchdb": "7.3.0",
     "pouchdb-find": "7.2.2",
@@ -53,22 +56,20 @@
     "sanitize-s3-objectkey": "0.0.1",
     "semver": "7.3.7",
     "tar-fs": "2.1.1",
-    "uuid": "8.3.2",
-    "zlib": "1.0.5"
+    "uuid": "8.3.2"
   },
   "devDependencies": {
+    "@jest/test-sequencer": "29.5.0",
     "@swc/core": "^1.3.25",
     "@swc/jest": "^0.2.24",
     "@trendyol/jest-testcontainers": "^2.1.1",
     "@types/chance": "1.1.3",
     "@types/ioredis": "4.28.0",
-    "@types/jest": "28.1.1",
+    "@types/jest": "29.5.0",
     "@types/koa": "2.13.4",
-    "@types/koa-pino-logger": "3.0.0",
     "@types/lodash": "4.14.180",
     "@types/node": "14.18.20",
     "@types/node-fetch": "2.6.1",
-    "@types/pino-http": "5.8.1",
     "@types/pouchdb": "6.4.0",
     "@types/redlock": "4.0.3",
     "@types/semver": "7.3.7",
@@ -76,16 +77,18 @@
     "@types/uuid": "8.3.4",
     "chance": "1.1.8",
     "ioredis-mock": "5.8.0",
-    "jest": "28.1.1",
+    "jest": "29.5.0",
+    "jest-environment-node": "29.5.0",
     "jest-serial-runner": "^1.2.1",
     "koa": "2.13.4",
     "nodemon": "2.0.16",
+    "pino-pretty": "10.0.0",
     "pouchdb-adapter-memory": "7.2.2",
     "timekeeper": "2.2.0",
-    "ts-jest": "28.0.4",
+    "ts-jest": "29.0.5",
     "ts-node": "10.8.1",
     "tsconfig-paths": "4.0.0",
     "typescript": "4.7.3"
   },
-  "gitHead": "f78bbd95cf51d45ef3af5dba3000c51fde639fe5"
+  "gitHead": "1d50b1f07c1a77b21d9757534c353631ce3314f8"
 }

package/src/auth/tests/auth.spec.ts

@@ -1,4 +1,5 @@
-import { structures, testEnv } from "../../../tests"
+import { structures } from "../../../tests"
+import { testEnv } from "../../../tests/extra"
 import * as auth from "../auth"
 import * as events from "../../events"
 

package/src/cache/tests/writethrough.spec.ts

@@ -1,7 +1,8 @@
+import { DBTestConfiguration } from "../../../tests/extra"
 import {
   structures,
-  DBTestConfiguration,
   expectFunctionWasCalledTimesWith,
+  mocks,
 } from "../../../tests"
 import { Writethrough } from "../writethrough"
 import { getDB } from "../../db"
@@ -77,9 +78,9 @@ describe("writethrough", () => {
           expect.arrayContaining([current._rev, current._rev, newRev])
         )
         expectFunctionWasCalledTimesWith(
-          console.warn,
+          mocks.alerts.logWarn,
           2,
-          "bb-warn: Ignoring redlock conflict in write-through cache"
+          "Ignoring redlock conflict in write-through cache"
         )
 
         const output = await db.get(current._id)

package/src/configs/configs.ts

@@ -5,6 +5,8 @@ import {
   GoogleInnerConfig,
   OIDCConfig,
   OIDCInnerConfig,
+  SCIMConfig,
+  SCIMInnerConfig,
   SettingsConfig,
   SettingsInnerConfig,
   SMTPConfig,
@@ -241,3 +243,10 @@ export async function getSMTPConfig(
     }
   }
 }
+
+// SCIM
+
+export async function getSCIMConfig(): Promise<SCIMInnerConfig | undefined> {
+  const config = await getConfig<SCIMConfig>(ConfigType.SCIM)
+  return config?.config
+}

package/src/configs/tests/configs.spec.ts

@@ -1,9 +1,5 @@
-import {
-  DBTestConfiguration,
-  generator,
-  testEnv,
-  structures,
-} from "../../../tests"
+import { generator, structures } from "../../../tests"
+import { DBTestConfiguration, testEnv } from "../../../tests/extra"
 import { ConfigType } from "@budibase/types"
 import env from "../../environment"
 import * as configs from "../configs"

package/src/constants/db.ts

@@ -14,6 +14,7 @@ export enum ViewName {
   USER_BY_APP = "by_app",
   USER_BY_EMAIL = "by_email2",
   BY_API_KEY = "by_api_key",
+  /** @deprecated - could be deleted */
   USER_BY_BUILDERS = "by_builders",
   LINK = "by_link",
   ROUTING = "screen_routes",

package/src/constants/misc.ts

@@ -22,6 +22,7 @@ export enum Header {
   TOKEN = "x-budibase-token",
   CSRF_TOKEN = "x-csrf-token",
   CORRELATION_ID = "x-budibase-correlation-id",
+  AUTHORIZATION = "authorization",
 }
 
 export enum GlobalRole {
@@ -38,6 +39,7 @@ export enum Config {
   GOOGLE = "google",
   OIDC = "oidc",
   OIDC_LOGOS = "logos_oidc",
+  SCIM = "scim",
 }
 
 export const MIN_VALID_DATE = new Date(-2147483647000)

package/src/context/mainContext.ts

@@ -2,7 +2,7 @@
 // store an app ID to pretend there is a context
 import env from "../environment"
 import Context from "./Context"
-import * as conversions from "../db/conversions"
+import * as conversions from "../docIds/conversions"
 import { getDB } from "../db/db"
 import {
   DocumentType,
@@ -43,8 +43,12 @@ export function baseGlobalDBName(tenantId: string | undefined | null) {
   }
 }
 
+export function getPlatformURL() {
+  return env.PLATFORM_URL
+}
+
 export function isMultiTenant() {
-  return env.MULTI_TENANCY
+  return !!env.MULTI_TENANCY
 }
 
 export function isTenantIdSet() {
@@ -111,10 +115,10 @@ export async function doInContext(appId: string, task: any): Promise<any> {
   )
 }
 
-export async function doInTenant(
+export async function doInTenant<T>(
   tenantId: string | null,
-  task: any
-): Promise<any> {
+  task: () => T
+): Promise<T> {
   // make sure default always selected in single tenancy
   if (!env.MULTI_TENANCY) {
     tenantId = tenantId || DEFAULT_TENANT_ID
@@ -214,6 +218,13 @@ export function doInEnvironmentContext(
   return newContext(updates, task)
 }
 
+export function doInScimContext(task: any) {
+  const updates: ContextMap = {
+    isScim: true,
+  }
+  return newContext(updates, task)
+}
+
 export function getEnvironmentVariables() {
   const context = Context.get()
   if (!context.environmentVariables) {
@@ -270,3 +281,9 @@ export function getDevAppDB(opts?: any): Database {
   }
   return getDB(conversions.getDevelopmentAppID(appId), opts)
 }
+
+export function isScim(): boolean {
+  const context = Context.get()
+  const scimCall = context?.isScim
+  return !!scimCall
+}

package/src/context/tests/index.spec.ts

@@ -1,6 +1,6 @@
-import { testEnv } from "../../../tests"
-const context = require("../")
-const { DEFAULT_TENANT_ID } = require("../../constants")
+import { testEnv } from "../../../tests/extra"
+import * as context from "../"
+import { DEFAULT_TENANT_ID } from "../../constants"
 
 describe("context", () => {
   describe("doInTenant", () => {
@@ -131,4 +131,17 @@ describe("context", () => {
       })
     })
   })
+
+  describe("doInScimContext", () => {
+    it("returns true when set", () => {
+      context.doInScimContext(() => {
+        const isScim = context.isScim()
+        expect(isScim).toBe(true)
+      })
+    })
+    it("returns false when not set", () => {
+      const isScim = context.isScim()
+      expect(isScim).toBe(false)
+    })
+  })
 })

package/src/context/types.ts

@@ -6,4 +6,5 @@ export type ContextMap = {
   appId?: string
   identity?: IdentityContext
   environmentVariables?: Record<string, string>
+  isScim?: boolean
 }

package/src/db/couch/DatabaseImpl.ts

@@ -15,7 +15,7 @@ import { getCouchInfo } from "./connections"
 import { directCouchCall } from "./utils"
 import { getPouchDB } from "./pouchDB"
 import { WriteStream, ReadStream } from "fs"
-import { newid } from "../../newid"
+import { newid } from "../../docIds/newid"
 
 function buildNano(couchInfo: { url: string; cookie: string }) {
   return Nano({

package/src/db/index.ts

@@ -2,9 +2,10 @@ export * from "./couch"
 export * from "./db"
 export * from "./utils"
 export * from "./views"
-export * from "./conversions"
+export * from "../docIds/conversions"
 export { default as Replication } from "./Replication"
 // exports to support old export structure
 export * from "../constants/db"
 export { getGlobalDBName, baseGlobalDBName } from "../context"
 export * from "./lucene"
+export * as searchIndexes from "./searchIndexes"