@budibase/worker 2.24.1 → 2.25.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.24.1",
+  "version": "2.25.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.24.1",
-    "@budibase/pro": "2.24.1",
-    "@budibase/string-templates": "2.24.1",
-    "@budibase/types": "2.24.1",
+    "@budibase/backend-core": "2.25.0",
+    "@budibase/pro": "2.25.0",
+    "@budibase/string-templates": "2.25.0",
+    "@budibase/types": "2.25.0",
     "@koa/router": "8.0.8",
     "@techpass/passport-openidconnect": "0.3.2",
     "@types/global-agent": "2.1.1",
@@ -108,5 +108,5 @@
       }
     }
   },
-  "gitHead": "5cb6ac027c7f45e174e3545a7399d425822970d8"
+  "gitHead": "75d949ef66bf20519446d3999c3412e106ef561d"
 }

package/src/api/routes/global/tests/realEmail.spec.ts

@@ -1,8 +1,6 @@
 jest.unmock("node-fetch")
-jest.unmock("aws-sdk")
 import { TestConfiguration } from "../../../../tests"
 import { EmailTemplatePurpose } from "../../../../constants"
-import { objectStoreTestProviders } from "@budibase/backend-core/tests"
 import { objectStore } from "@budibase/backend-core"
 import tk from "timekeeper"
 import { EmailAttachment } from "@budibase/types"
@@ -19,12 +17,10 @@ describe("/api/global/email", () => {
 
   beforeAll(async () => {
     tk.reset()
-    await objectStoreTestProviders.minio.start()
     await config.beforeAll()
   })
 
   afterAll(async () => {
-    await objectStoreTestProviders.minio.stop()
     await config.afterAll()
   })
 

package/src/api/routes/global/tests/self.spec.ts

@@ -55,6 +55,7 @@ describe("/api/global/self", () => {
     const res = await config.api.self
       .updateSelf(user, {
         onboardedAt: "2023-03-07T14:10:54.869Z",
+        freeTrialConfirmedAt: "2024-03-17T14:10:54.869Z",
       })
       .expect(200)
 
@@ -63,6 +64,7 @@ describe("/api/global/self", () => {
     user._rev = dbUser._rev
     user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
     expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z")
+    expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z")
     expect(res.body._id).toBe(user._id)
   })
 })

package/src/api/routes/validation/users.ts

@@ -26,6 +26,7 @@ export const buildSelfSaveValidation = () => {
     firstName: OPTIONAL_STRING,
     lastName: OPTIONAL_STRING,
     onboardedAt: Joi.string().optional(),
+    freeTrialConfirmedAt: Joi.string().optional(),
     appFavourites: Joi.array().optional(),
     tours: Joi.object().optional(),
   }

package/src/utilities/email.ts

@@ -6,8 +6,7 @@ import { processString } from "@budibase/string-templates"
 import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
 import { configs, cache, objectStore } from "@budibase/backend-core"
 import ical from "ical-generator"
-import fetch from "node-fetch"
-import path from "path"
+import _ from "lodash"
 
 const nodemailer = require("nodemailer")
 
@@ -165,39 +164,12 @@ export async function sendEmail(
     }),
   }
   if (opts?.attachments) {
-    const attachments = await Promise.all(
-      opts.attachments?.map(async attachment => {
-        const isFullyFormedUrl =
-          attachment.url.startsWith("http://") ||
-          attachment.url.startsWith("https://")
-        if (isFullyFormedUrl) {
-          const response = await fetch(attachment.url)
-          if (!response.ok) {
-            throw new Error(`unexpected response ${response.statusText}`)
-          }
-          const fallbackFilename = path.basename(
-            new URL(attachment.url).pathname
-          )
-          return {
-            filename: attachment.filename || fallbackFilename,
-            content: response?.body,
-          }
-        } else {
-          const url = attachment.url
-          const result = objectStore.extractBucketAndPath(url)
-          if (result === null) {
-            throw new Error("Invalid signed URL")
-          }
-          const { bucket, path } = result
-          const readStream = await objectStore.getReadStream(bucket, path)
-          const fallbackFilename = path.split("/").pop() || ""
-          return {
-            filename: attachment.filename || fallbackFilename,
-            content: readStream,
-          }
-        }
-      })
+    let attachments = await Promise.all(
+      opts.attachments?.map(objectStore.processAutomationAttachment)
     )
+    attachments = attachments.map(attachment => {
+      return _.omit(attachment, "path")
+    })
     message = { ...message, attachments }
   }