From 862525cc0e1c8600bd044ee98bc630f7c7a0a029 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 8 Nov 2022 11:34:16 +0000
Subject: [PATCH 1/2] Fixing an issue which was alerting, x-amz-meta-fieldname
 contains an invalid value, this error isn't really documented, but comes from
 if a metadata tag is sent up with nullish, or a non-string type. Fixing this
 in the core library, removing an invalid inputs.

---
 packages/backend-core/src/objectStore/index.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 8453c9aee6..15b01795ab 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -163,6 +163,12 @@ export const upload = async ({
     ContentType: type || CONTENT_TYPE_MAP[extension.toLowerCase()],
   }
   if (metadata) {
+    // remove any nullish keys from the metadata object, as these may be considered invalid
+    for (let key of Object.keys(metadata)) {
+      if (!metadata[key] || typeof metadata[key] !== "string") {
+        delete metadata[key]
+      }
+    }
     config.Metadata = metadata
   }
   return objectStore.upload(config).promise()

From 687aa1c6f3e40e84b50e0a630487637a795398df Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 8 Nov 2022 11:49:07 +0000
Subject: [PATCH 2/2] Adding more type handling around the upload object store
 function.

---
 .../backend-core/src/objectStore/index.ts     | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 15b01795ab..87b682b5bf 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -22,7 +22,19 @@ type ListParams = {
   ContinuationToken?: string
 }
 
+type UploadParams = {
+  bucket: string
+  filename: string
+  path: string
+  type: string
+  // can be undefined, we will remove it
+  metadata: {
+    [key: string]: string | undefined
+  }
+}
+
 const CONTENT_TYPE_MAP: any = {
+  txt: "text/plain",
   html: "text/html",
   css: "text/css",
   js: "application/javascript",
@@ -149,20 +161,26 @@ export const upload = async ({
   path,
   type,
   metadata,
-}: any) => {
+}: UploadParams) => {
   const extension = filename.split(".").pop()
   const fileBytes = fs.readFileSync(path)
 
   const objectStore = ObjectStore(bucketName)
   await makeSureBucketExists(objectStore, bucketName)
 
+  let contentType = type
+  if (!contentType) {
+    contentType = extension
+      ? CONTENT_TYPE_MAP[extension.toLowerCase()]
+      : CONTENT_TYPE_MAP.txt
+  }
   const config: any = {
     // windows file paths need to be converted to forward slashes for s3
     Key: sanitizeKey(filename),
     Body: fileBytes,
-    ContentType: type || CONTENT_TYPE_MAP[extension.toLowerCase()],
+    ContentType: contentType,
   }
-  if (metadata) {
+  if (metadata && typeof metadata === "object") {
     // remove any nullish keys from the metadata object, as these may be considered invalid
     for (let key of Object.keys(metadata)) {
       if (!metadata[key] || typeof metadata[key] !== "string") {