fix: Adds support for VirtualHost style AWS S3 buckets (#1847)

* Bump aws-sdk

* support virtual host buckets

* fix

* fix: VirtualHost bucket without explicit AWS_S3_FORCE_PATH_STYLE=false

server/utils/s3.js

@@ -16,7 +16,7 @@ const s3 = new AWS.S3({
   s3ForcePathStyle: AWS_S3_FORCE_PATH_STYLE,
   accessKeyId: AWS_ACCESS_KEY_ID,
   secretAccessKey: AWS_SECRET_ACCESS_KEY,
-  endpoint: new AWS.Endpoint(process.env.AWS_S3_UPLOAD_BUCKET_URL),
+  region: AWS_REGION,
   signatureVersion: "v4",
 });
 
@@ -84,6 +84,14 @@ export const publicS3Endpoint = (isServerUpload?: boolean) => {
     "localhost:"
   ).replace(/\/$/, "");
 
+  // support old path-style S3 uploads and new virtual host uploads by checking
+  // for the bucket name in the endpoint url before appending.
+  const isVirtualHost = host.includes(AWS_S3_UPLOAD_BUCKET_NAME);
+
+  if (isVirtualHost) {
+    return host;
+  }
+
   return `${host}/${
     isServerUpload && isDocker ? "s3/" : ""
   }${AWS_S3_UPLOAD_BUCKET_NAME}`;