Merge branch 'main' into feat/mass-import

server/utils/s3.js

@@ -17,6 +17,11 @@ const s3 = new AWS.S3({
   accessKeyId: AWS_ACCESS_KEY_ID,
   secretAccessKey: AWS_SECRET_ACCESS_KEY,
   region: AWS_REGION,
+  endpoint: process.env.AWS_S3_UPLOAD_BUCKET_URL.includes(
+    AWS_S3_UPLOAD_BUCKET_NAME
+  )
+    ? undefined
+    : new AWS.Endpoint(process.env.AWS_S3_UPLOAD_BUCKET_URL),
   signatureVersion: "v4",
 });
 
@@ -110,7 +115,6 @@ export const uploadToS3FromBuffer = async (
       Key: key,
       ContentType: contentType,
       ContentLength: buffer.length,
-      ServerSideEncryption: "AES256",
       Body: buffer,
     })
     .promise();
@@ -135,7 +139,6 @@ export const uploadToS3FromUrl = async (
         Key: key,
         ContentType: res.headers["content-type"],
         ContentLength: res.headers["content-length"],
-        ServerSideEncryption: "AES256",
         Body: buffer,
       })
       .promise();