@budibase/backend-core 2.23.10 → 2.23.12

package/dist/index.js

@@ -54482,6 +54482,7 @@ var AutomationIOType = /* @__PURE__ */ ((AutomationIOType2) => {
   AutomationIOType2["ARRAY"] = "array";
   AutomationIOType2["JSON"] = "json";
   AutomationIOType2["DATE"] = "date";
+  AutomationIOType2["ATTACHMENT"] = "attachment";
   return AutomationIOType2;
 })(AutomationIOType || {});
 var AutomationCustomIOType = /* @__PURE__ */ ((AutomationCustomIOType2) => {
@@ -54502,6 +54503,7 @@ var AutomationCustomIOType = /* @__PURE__ */ ((AutomationCustomIOType2) => {
   AutomationCustomIOType2["WEBHOOK_URL"] = "webhookUrl";
   AutomationCustomIOType2["AUTOMATION"] = "automation";
   AutomationCustomIOType2["AUTOMATION_FIELDS"] = "automationFields";
+  AutomationCustomIOType2["MULTI_ATTACHMENTS"] = "multi_attachments";
   return AutomationCustomIOType2;
 })(AutomationCustomIOType || {});
 var AutomationTriggerStepId = /* @__PURE__ */ ((AutomationTriggerStepId2) => {
@@ -55611,7 +55613,8 @@ var DefaultBucketName = {
   APPS: "prod-budi-app-assets",
   TEMPLATES: "templates",
   GLOBAL: "global",
-  PLUGINS: "plugins"
+  PLUGINS: "plugins",
+  TEMP: "tmp-file-attachments"
 };
 var selfHosted = !!parseInt(process.env.SELF_HOSTED || "");
 function getAPIEncryptionKey() {
@@ -55702,6 +55705,7 @@ var environment = {
   TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES,
   GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
   PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
+  TEMP_BUCKET_NAME: process.env.TEMP_BUCKET_NAME || DefaultBucketName.TEMP,
   USE_COUCH: process.env.USE_COUCH || true,
   MOCK_REDIS: process.env.MOCK_REDIS,
   DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
@@ -56848,16 +56852,19 @@ var objectStore_exports2 = {};
 __export(objectStore_exports2, {
   ObjectStore: () => ObjectStore,
   ObjectStoreBuckets: () => ObjectStoreBuckets,
+  bucketTTLConfig: () => bucketTTLConfig,
   budibaseTempDir: () => budibaseTempDir,
   clientLibraryCDNUrl: () => clientLibraryCDNUrl,
   clientLibraryPath: () => clientLibraryPath,
   clientLibraryUrl: () => clientLibraryUrl,
+  createBucketIfNotExists: () => createBucketIfNotExists,
   deleteFile: () => deleteFile,
   deleteFiles: () => deleteFiles,
   deleteFolder: () => deleteFolder,
   downloadTarball: () => downloadTarball,
   downloadTarballDirect: () => downloadTarballDirect,
   enrichPluginURLs: () => enrichPluginURLs,
+  extractBucketAndPath: () => extractBucketAndPath,
   getAppFileUrl: () => getAppFileUrl,
   getGlobalFileS3Key: () => getGlobalFileS3Key,
   getGlobalFileUrl: () => getGlobalFileUrl,
@@ -56867,7 +56874,6 @@ __export(objectStore_exports2, {
   getPresignedUrl: () => getPresignedUrl,
   getReadStream: () => getReadStream,
   listAllObjects: () => listAllObjects,
-  makeSureBucketExists: () => makeSureBucketExists,
   retrieve: () => retrieve,
   retrieveDirectory: () => retrieveDirectory,
   retrieveToTmp: () => retrieveToTmp,
@@ -56897,7 +56903,8 @@ var ObjectStoreBuckets = {
   APPS: environment_default.APPS_BUCKET_NAME,
   TEMPLATES: environment_default.TEMPLATES_BUCKET_NAME,
   GLOBAL: environment_default.GLOBAL_BUCKET_NAME,
-  PLUGINS: environment_default.PLUGIN_BUCKET_NAME
+  PLUGINS: environment_default.PLUGIN_BUCKET_NAME,
+  TEMP: environment_default.TEMP_BUCKET_NAME
 };
 var bbTmp = (0, import_path.join)((0, import_os.tmpdir)(), ".budibase");
 try {
@@ -56910,6 +56917,24 @@ try {
 function budibaseTempDir() {
   return bbTmp;
 }
+var bucketTTLConfig = (bucketName, days) => {
+  const lifecycleRule = {
+    ID: `${bucketName}-ExpireAfter${days}days`,
+    Prefix: "",
+    Status: "Enabled",
+    Expiration: {
+      Days: days
+    }
+  };
+  const lifecycleConfiguration = {
+    Rules: [lifecycleRule]
+  };
+  const params2 = {
+    Bucket: bucketName,
+    LifecycleConfiguration: lifecycleConfiguration
+  };
+  return params2;
+};
 
 // src/objectStore/objectStore.ts
 var import_uuid2 = require("uuid");
@@ -58216,18 +58241,22 @@ function isDocumentConflictError(error) {
 }
 
 // src/objectStore/objectStore.ts
+var import_promises = __toESM(require("fs/promises"));
 var sanitize = require("sanitize-s3-objectkey");
 var streamPipeline = (0, import_util.promisify)(import_stream.default.pipeline);
 var STATE = {
   bucketCreationPromises: {}
 };
+var signedFilePrefix = "/files/signed";
 var CONTENT_TYPE_MAP = {
   txt: "text/plain",
   html: "text/html",
   css: "text/css",
   js: "application/javascript",
   json: "application/json",
-  gz: "application/gzip"
+  gz: "application/gzip",
+  svg: "image/svg+xml",
+  form: "multipart/form-data"
 };
 var STRING_CONTENT_TYPES = [
   CONTENT_TYPE_MAP.html,
@@ -58264,17 +58293,19 @@ function ObjectStore(bucket, opts = { presigning: false }) {
   }
   return new import_aws_sdk.default.S3(config);
 }
-async function makeSureBucketExists(client, bucketName) {
+async function createBucketIfNotExists(client, bucketName) {
   bucketName = sanitizeBucket(bucketName);
   try {
     await client.headBucket({
       Bucket: bucketName
     }).promise();
+    return { created: false, exists: true };
   } catch (err) {
     const promises = STATE.bucketCreationPromises;
     const doesntExist = err.statusCode === 404, noAccess = err.statusCode === 403;
     if (promises[bucketName]) {
       await promises[bucketName];
+      return { created: false, exists: true };
     } else if (doesntExist || noAccess) {
       if (doesntExist) {
         promises[bucketName] = client.createBucket({
@@ -58282,6 +58313,9 @@ async function makeSureBucketExists(client, bucketName) {
         }).promise();
         await promises[bucketName];
         delete promises[bucketName];
+        return { created: true, exists: false };
+      } else {
+        throw new Error("Access denied to object store bucket." + err);
       }
     } else {
       throw new Error("Unable to write to object store bucket.");
@@ -58293,12 +58327,20 @@ async function upload({
   filename,
   path: path2,
   type,
-  metadata
+  metadata,
+  body: body2,
+  ttl
 }) {
   const extension = filename.split(".").pop();
-  const fileBytes = import_fs3.default.readFileSync(path2);
+  const fileBytes = path2 ? (await import_promises.default.open(path2)).createReadStream() : body2;
   const objectStore = ObjectStore(bucketName);
-  await makeSureBucketExists(objectStore, bucketName);
+  const bucketCreated = await createBucketIfNotExists(objectStore, bucketName);
+  if (ttl && (bucketCreated.created || bucketCreated.exists)) {
+    let ttlConfig = bucketTTLConfig(bucketName, ttl);
+    if (objectStore.putBucketLifecycleConfiguration) {
+      await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise();
+    }
+  }
   let contentType = type;
   if (!contentType) {
     contentType = extension ? CONTENT_TYPE_MAP[extension.toLowerCase()] : CONTENT_TYPE_MAP.txt;
@@ -58319,9 +58361,23 @@ async function upload({
   }
   return objectStore.upload(config).promise();
 }
-async function streamUpload(bucketName, filename, stream2, extra = {}) {
+async function streamUpload({
+  bucket: bucketName,
+  stream: stream2,
+  filename,
+  type,
+  extra,
+  ttl
+}) {
+  const extension = filename.split(".").pop();
   const objectStore = ObjectStore(bucketName);
-  await makeSureBucketExists(objectStore, bucketName);
+  const bucketCreated = await createBucketIfNotExists(objectStore, bucketName);
+  if (ttl && (bucketCreated.created || bucketCreated.exists)) {
+    let ttlConfig = bucketTTLConfig(bucketName, ttl);
+    if (objectStore.putBucketLifecycleConfiguration) {
+      await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise();
+    }
+  }
   if (filename?.endsWith(".js")) {
     extra = {
       ...extra,
@@ -58333,10 +58389,15 @@ async function streamUpload(bucketName, filename, stream2, extra = {}) {
       ContentType: "image"
     };
   }
+  let contentType = type;
+  if (!contentType) {
+    contentType = extension ? CONTENT_TYPE_MAP[extension.toLowerCase()] : CONTENT_TYPE_MAP.txt;
+  }
   const params2 = {
     Bucket: sanitizeBucket(bucketName),
     Key: sanitizeKey(filename),
     Body: stream2,
+    ContentType: contentType,
     ...extra
   };
   return objectStore.upload(params2).promise();
@@ -58392,7 +58453,7 @@ function getPresignedUrl(bucketName, key, durationSeconds = 3600) {
     const signedUrl = new URL(url);
     const path2 = signedUrl.pathname;
     const query = signedUrl.search;
-    return `/files/signed${path2}${query}`;
+    return `${signedFilePrefix}${path2}${query}`;
   }
 }
 async function retrieveToTmp(bucketName, filepath) {
@@ -58438,7 +58499,7 @@ async function retrieveDirectory(bucketName, path2) {
 }
 async function deleteFile(bucketName, filepath) {
   const objectStore = ObjectStore(bucketName);
-  await makeSureBucketExists(objectStore, bucketName);
+  await createBucketIfNotExists(objectStore, bucketName);
   const params2 = {
     Bucket: bucketName,
     Key: sanitizeKey(filepath)
@@ -58447,7 +58508,7 @@ async function deleteFile(bucketName, filepath) {
 }
 async function deleteFiles(bucketName, filepaths) {
   const objectStore = ObjectStore(bucketName);
-  await makeSureBucketExists(objectStore, bucketName);
+  await createBucketIfNotExists(objectStore, bucketName);
   const params2 = {
     Bucket: bucketName,
     Delete: {
@@ -58492,7 +58553,13 @@ async function uploadDirectory(bucketName, localPath, bucketPath) {
     if (file.isDirectory()) {
       uploads.push(uploadDirectory(bucketName, local, path2));
     } else {
-      uploads.push(streamUpload(bucketName, path2, import_fs3.default.createReadStream(local)));
+      uploads.push(
+        streamUpload({
+          bucket: bucketName,
+          filename: path2,
+          stream: import_fs3.default.createReadStream(local)
+        })
+      );
     }
   }
   await Promise.all(uploads);
@@ -58530,6 +58597,16 @@ async function getReadStream(bucketName, path2) {
   };
   return client.getObject(params2).createReadStream();
 }
+function extractBucketAndPath(url) {
+  const baseUrl = url.split("?")[0];
+  const regex = new RegExp(`^${signedFilePrefix}/(?<bucket>[^/]+)/(?<path>.+)$`);
+  const match = baseUrl.match(regex);
+  if (match && match.groups) {
+    const { bucket, path: path2 } = match.groups;
+    return { bucket, path: path2 };
+  }
+  return null;
+}
 
 // src/objectStore/cloudfront.ts
 var cfsign = __toESM(require("aws-cloudfront-sign"));
@@ -64830,7 +64907,6 @@ var getMigrationsDoc = async (db) => {
     if (err.status && err.status === 404) {
       return { _id: "migrations" /* MIGRATIONS */ };
     } else {
-      console.error(err);
       throw err;
     }
   }
@@ -65334,7 +65410,6 @@ async function strategyFactory(config, callbackUrl, saveUserFn) {
       verify
     );
   } catch (err) {
-    console.error(err);
     throw new Error(`Error constructing google authentication strategy: ${err}`);
   }
 }
@@ -65399,7 +65474,6 @@ async function strategyFactory2(config, saveUserFn) {
     strategy.name = "oidc";
     return strategy;
   } catch (err) {
-    console.error(err);
     throw new Error(`Error constructing OIDC authentication strategy - ${err}`);
   }
 }
@@ -65428,7 +65502,6 @@ async function fetchStrategyConfig(oidcConfig, callbackUrl) {
       callbackURL: callbackUrl
     };
   } catch (err) {
-    console.error(err);
     throw new Error(
       `Error constructing OIDC authentication configuration - ${err}`
     );
@@ -65774,7 +65847,6 @@ function authenticated_default(noAuthPatterns = [], opts = {
         } catch (err) {
           authenticated = false;
           console.error(`Auth Error: ${err.message}`);
-          console.error(err);
           clearCookie(ctx, "budibase:auth" /* Auth */);
         }
       }
@@ -65816,7 +65888,6 @@ function authenticated_default(noAuthPatterns = [], opts = {
       }
     } catch (err) {
       console.error(`Auth Error: ${err.message}`);
-      console.error(err);
       if (err?.name === "JsonWebTokenError") {
         clearCookie(ctx, "budibase:auth" /* Auth */);
       } else if (err?.code === "invalid_api_key" /* INVALID_API_KEY */) {
@@ -66003,7 +66074,7 @@ async function errorHandling(ctx, next) {
     if (status >= 400 && status < 500) {
       console.warn(err);
     } else {
-      console.error(err);
+      console.error("Got 400 response code", err);
     }
     let error = {
       message: err.message,
@@ -66106,7 +66177,6 @@ async function refreshOIDCAccessToken(chosenConfig, refreshToken) {
     }
     strategy = await oidc_exports.strategyFactory(enrichedConfig, ssoSaveUserNoOp);
   } catch (err) {
-    console.error(err);
     throw new Error("Could not refresh OAuth Token");
   }
   refresh.use(strategy, {
@@ -66134,7 +66204,6 @@ async function refreshGoogleAccessToken(config, refreshToken) {
       ssoSaveUserNoOp
     );
   } catch (err) {
-    console.error(err);
     throw new Error(
       `Error constructing OIDC refresh strategy: message=${err.message}`
     );