@budibase/worker 3.13.26 → 3.13.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.13.26",
+  "version": "3.13.28",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -114,5 +114,5 @@
       }
     }
   },
-  "gitHead": "9a55f2f9e6b196e6779a01425bb17a00b3643431"
+  "gitHead": "de8a462d540b26a2040f4c8059d0a2395234c628"
 }

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

@@ -2,6 +2,8 @@ import * as email from "../../../utilities/email"
 import env from "../../../environment"
 import * as auth from "./auth"
 import {
+  BadRequestError,
+  ForbiddenError,
   cache,
   configs,
   db as dbCore,
@@ -9,7 +11,6 @@ import {
   events,
   objectStore,
   tenancy,
-  BadRequestError,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import {
@@ -26,11 +27,13 @@ import {
   isAIConfig,
   isGoogleConfig,
   isOIDCConfig,
+  isRecaptchaConfig,
   isSettingsConfig,
   isSMTPConfig,
   OIDCConfigs,
   OIDCLogosConfig,
   PASSWORD_REPLACEMENT,
+  RecaptchaInnerConfig,
   SaveConfigRequest,
   SaveConfigResponse,
   SettingsBrandingConfig,
@@ -273,6 +276,21 @@ export async function processAIConfig(
   }
 }
 
+export async function processRecaptchaConfig(
+  config: RecaptchaInnerConfig,
+  existingConfig?: RecaptchaInnerConfig
+) {
+  if (!(await pro.features.isRecaptchaEnabled())) {
+    throw new ForbiddenError("License does not allow use of recaptcha")
+  }
+  if (config.secretKey === PASSWORD_REPLACEMENT && !existingConfig) {
+    throw new BadRequestError("No secret key provided")
+  }
+  if (config.secretKey === PASSWORD_REPLACEMENT && existingConfig) {
+    config.secretKey = existingConfig.secretKey
+  }
+}
+
 export async function save(
   ctx: UserCtx<SaveConfigRequest, SaveConfigResponse>
 ) {
@@ -306,6 +324,9 @@ export async function save(
           await processAIConfig(config, existingConfig.config)
         }
         break
+      case ConfigType.RECAPTCHA:
+        await processRecaptchaConfig(config, existingConfig?.config)
+        break
     }
   } catch (err: any) {
     ctx.throw(400, err)
@@ -430,6 +451,8 @@ function stripSecrets(config: Config) {
     for (const c of config.config.configs) {
       c.clientSecret = PASSWORD_REPLACEMENT
     }
+  } else if (isRecaptchaConfig(config)) {
+    config.config.secretKey = PASSWORD_REPLACEMENT
   }
 }
 

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

@@ -4,6 +4,7 @@ import {
   ActivateLicenseKeyResponse,
   ActivateOfflineLicenseTokenRequest,
   ActivateOfflineLicenseTokenResponse,
+  GetInstallInfo,
   GetLicenseKeyResponse,
   GetOfflineIdentifierResponse,
   GetOfflineLicenseTokenResponse,
@@ -11,6 +12,7 @@ import {
   RefreshOfflineLicenseResponse,
   UserCtx,
 } from "@budibase/types"
+import { installation } from "@budibase/backend-core"
 
 // LICENSE KEY
 
@@ -94,3 +96,11 @@ export const getQuotaUsage = async (
 ) => {
   ctx.body = await quotas.getQuotaUsage()
 }
+
+export const getInstallInfo = async (ctx: UserCtx<void, GetInstallInfo>) => {
+  const install = await installation.getInstall()
+  ctx.body = {
+    installId: install.installId,
+    version: install.version,
+  }
+}

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

@@ -214,15 +214,6 @@ export const adminUser = async (
   const { email, password, tenantId, ssoId, givenName, familyName } =
     ctx.request.body
 
-  if (await platform.tenants.exists(tenantId)) {
-    ctx.throw(403, "Organisation already exists.")
-  }
-
-  if (env.MULTI_TENANCY) {
-    // store the new tenant record in the platform db
-    await platform.tenants.addTenant(tenantId)
-  }
-
   await tenancy.doInTenant(tenantId, async () => {
     // account portal sends a pre-hashed password - honour param to prevent double hashing
     const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)

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

@@ -79,6 +79,13 @@ function aiValidation() {
   )
 }
 
+function recaptchaValidation() {
+  return Joi.object({
+    siteKey: Joi.string().required(),
+    secretKey: Joi.string().required(),
+  }).required()
+}
+
 function buildConfigSaveValidation() {
   // prettier-ignore
   return auth.joiValidator.body(Joi.object({
@@ -97,7 +104,8 @@ function buildConfigSaveValidation() {
           { is: ConfigType.GOOGLE, then: googleValidation() },
           { is: ConfigType.OIDC, then: oidcValidation() },
           { is: ConfigType.SCIM, then: scimValidation() },
-          { is: ConfigType.AI, then: aiValidation() }
+          { is: ConfigType.AI, then: aiValidation() },
+          { is: ConfigType.RECAPTCHA, then: recaptchaValidation() },
         ],
       }),
   }).required().unknown(true),

package/src/api/routes/global/license.ts

@@ -18,6 +18,7 @@ const activateOfflineLicenseValidator = middleware.joiValidator.body(
 loggedInRoutes
   .post("/api/global/license/refresh", controller.refresh)
   .get("/api/global/license/usage", controller.getQuotaUsage)
+  .get("/api/global/install", controller.getInstallInfo)
   // LICENSE KEY
   .post(
     "/api/global/license/key",

package/src/sdk/tenants/tenants.ts

@@ -4,7 +4,6 @@ import { quotas } from "@budibase/pro"
 
 export async function deleteTenant(tenantId: string) {
   await quotas.bustCache()
-  await platform.tenants.removeTenant(tenantId)
   await removeTenantUsers(tenantId)
   await removeTenantApps(tenantId)
   await removeGlobalDB(tenantId)