@budibase/server 3.23.10 → 3.23.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "3.23.10",
+  "version": "3.23.11",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -219,5 +219,5 @@
       }
     }
   },
-  "gitHead": "ee30281f12deb91eb732b3a423ffcaacec8acc4a"
+  "gitHead": "c085b108795137b085f13ae0b0387bcf8454ee52"
 }

package/src/integrations/rest.ts

@@ -481,59 +481,41 @@ export class RestIntegration implements IntegrationBase {
             }
           }
         )
-        const nodeForm = form as FormData & {
-          getHeaders?: () => Record<string, string | string[]>
-        }
-        const formHeaders = nodeForm.getHeaders?.()
-        if (formHeaders) {
-          const ensureHeaderObject = (): Record<
-            string,
-            string | readonly string[]
-          > => {
-            if (!input.headers) {
-              const headerObject: Record<string, string> = {}
-              input.headers = headerObject
-              return headerObject
-            }
-            if (Array.isArray(input.headers)) {
-              const headerObject = input.headers.reduce<Record<string, string>>(
-                (acc, [name, value]) => {
-                  acc[name] = value
-                  return acc
-                },
-                {}
-              )
-              input.headers = headerObject
-              return headerObject
-            }
-            if (input.headers instanceof Headers) {
-              const headerObject: Record<string, string> = {}
-              input.headers.forEach((value, key) => {
-                headerObject[key] = value
-              })
-              input.headers = headerObject
-              return headerObject
-            }
-            return input.headers
+        const ensureHeaderObject = (): Record<
+          string,
+          string | readonly string[]
+        > => {
+          if (!input.headers) {
+            const headerObject: Record<string, string> = {}
+            return headerObject
           }
-          const headers = ensureHeaderObject()
-          for (let [headerName, headerValue] of Object.entries(formHeaders)) {
-            const normalizedName = headerName.toLowerCase()
-            const existingKey = Object.keys(headers).find(
-              key => key.toLowerCase() === normalizedName
+          if (Array.isArray(input.headers)) {
+            const headerObject = input.headers.reduce<Record<string, string>>(
+              (acc, [name, value]) => {
+                acc[name] = value
+                return acc
+              },
+              {}
             )
-            if (existingKey) {
-              continue
-            }
-            if (typeof headerValue === "undefined" || headerValue === null) {
-              continue
-            }
-            const headerString = Array.isArray(headerValue)
-              ? headerValue.join(", ")
-              : String(headerValue)
-            headers[headerName] = headerString
+            return headerObject
           }
+          if (input.headers instanceof Headers) {
+            return Object.fromEntries(input.headers)
+          }
+          return input.headers
+        }
+
+        const headers = ensureHeaderObject()
+
+        // Delete Content-Type to allow fetch to auto-generate the correct header/boundary.
+        const existingContentTypeKey = Object.keys(headers).find(
+          key => key.toLowerCase() === "content-type"
+        )
+        if (existingContentTypeKey) {
+          delete headers[existingContentTypeKey]
         }
+
+        input.headers = headers
         input.body = form
         break
       }

package/src/integrations/tests/rest.spec.ts

@@ -28,9 +28,10 @@ import {
 import { createServer } from "http"
 import { AddressInfo } from "net"
 import * as undici from "undici"
-import type {
+import {
   RequestInit as UndiciRequestInit,
   Response as UndiciResponse,
+  FormData as UndiciFormData,
 } from "undici"
 import TestConfiguration from "../../../src/tests/utilities/TestConfiguration"
 import sdk from "../../sdk"
@@ -299,6 +300,48 @@ describe("REST Integration", () => {
       expectFormDataToMatch(body, { a: "1", b: "2" })
     })
 
+    it("should correctly clean conflicting Content-Type header for form data", async () => {
+      const input = { payload: "data", count: 42 }
+
+      queueJsonResponse(
+        (url, options) => {
+          expect(url).toEqual("https://example.com/api/submit")
+          expect(options?.method).toEqual("POST")
+          expect(options?.body).toBeInstanceOf(UndiciFormData)
+
+          const headers = options?.headers as Record<string, any>
+          const contentTypeHeader =
+            headers["Content-Type"] || headers["content-type"]
+          // The original Content-Type inserted in the test data below should be stripped so that
+          // undici can automatically insert the correct multipart/form-data header with boundary
+          expect(contentTypeHeader).toBeUndefined()
+        },
+        { success: true }
+      )
+
+      const { data } = await integration.create({
+        path: "api/submit",
+        bodyType: BodyType.FORM_DATA,
+        requestBody: input,
+        // Injects a conflicting header that the production code MUST delete
+        headers: {
+          "Content-Type": "application/json",
+          "X-Custom-Header": "KeepMe",
+        },
+      })
+
+      // Assert that the non-Content-Type header was kept
+      const lastFetchOptions = fetchMock.mock.calls[0][1]
+      expect((lastFetchOptions!.headers! as any)["X-Custom-Header"]).toEqual(
+        "KeepMe"
+      )
+      expect(
+        (lastFetchOptions!.headers! as any)["Content-Type"]
+      ).toBeUndefined()
+
+      expect(data).toEqual({ success: true })
+    })
+
     it("should allow encoded form data", () => {
       const { URLSearchParams } = require("url")
       const output = integration.addBody("encoded", input, {})