@budibase/worker 3.23.1 → 3.23.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.23.1",
+  "version": "3.23.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -109,5 +109,5 @@
       }
     }
   },
-  "gitHead": "ade970d3ee9b56413873984aefa4b39297002204"
+  "gitHead": "c6b0bb006540458aa14bc31d8a4e90e39371ebba"
 }

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

@@ -16,6 +16,7 @@ import {
   ConfigChecklistResponse,
   ConfigType,
   Ctx,
+  IMAPInnerConfig,
   DeleteConfigResponse,
   FindConfigResponse,
   GetPublicOIDCConfigResponse,
@@ -23,6 +24,7 @@ import {
   GoogleInnerConfig,
   isAIConfig,
   isGoogleConfig,
+  isIMAPConfig,
   isOIDCConfig,
   isRecaptchaConfig,
   isSettingsConfig,
@@ -177,6 +179,19 @@ async function processSMTPConfig(
   }
 }
 
+async function processIMAPConfig(
+  config: IMAPInnerConfig,
+  existingConfig?: IMAPInnerConfig
+) {
+  if (config.auth?.pass === PASSWORD_REPLACEMENT) {
+    if (existingConfig && existingConfig.auth?.pass) {
+      config.auth.pass = existingConfig.auth.pass
+    } else {
+      throw new BadRequestError("IMAP password is required")
+    }
+  }
+}
+
 async function processSettingsConfig(
   config: SettingsInnerConfig & SettingsBrandingConfig,
   existingConfig?: SettingsInnerConfig & SettingsBrandingConfig
@@ -317,6 +332,9 @@ export async function save(
       case ConfigType.SMTP:
         await processSMTPConfig(config, existingConfig?.config)
         break
+      case ConfigType.IMAP:
+        await processIMAPConfig(config, existingConfig?.config)
+        break
       case ConfigType.SETTINGS:
         await processSettingsConfig(config, existingConfig?.config)
         break
@@ -450,6 +468,10 @@ function stripSecrets(config: Config) {
     if (config.config.auth?.pass) {
       config.config.auth.pass = PASSWORD_REPLACEMENT
     }
+  } else if (isIMAPConfig(config)) {
+    if (config.config.auth?.pass) {
+      config.config.auth.pass = PASSWORD_REPLACEMENT
+    }
   } else if (isGoogleConfig(config)) {
     config.config.clientSecret = PASSWORD_REPLACEMENT
   } else if (isOIDCConfig(config)) {

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

@@ -19,6 +19,21 @@ function smtpValidation() {
   }).unknown(true)
 }
 
+function imapValidation() {
+  // prettier-ignore
+  return Joi.object({
+    port: Joi.number().required(),
+    host: Joi.string().required(),
+    secure: Joi.boolean().optional(),
+    mailbox: Joi.string().optional(),
+    auth: Joi.object({
+      type: Joi.string().valid("login", null),
+      user: Joi.string().required(),
+      pass: Joi.string().allow("", null),
+    }).optional(),
+  }).unknown(true)
+}
+
 function settingValidation() {
   // prettier-ignore
   return Joi.object({
@@ -100,6 +115,7 @@ function buildConfigSaveValidation() {
       .conditional("type", {
         switch: [
           { is: ConfigType.SMTP, then: smtpValidation() },
+          { is: ConfigType.IMAP, then: imapValidation() },
           { is: ConfigType.SETTINGS, then: settingValidation() },
           { is: ConfigType.ACCOUNT, then: Joi.object().unknown(true) },
           { is: ConfigType.GOOGLE, then: googleValidation() },