chore: fixing uploadFile when using s3 bucket

src/uploads/imageResizer.ts

@@ -1,12 +1,12 @@
-import fs from 'fs';
-import sharp from 'sharp';
-import sanitize from 'sanitize-filename';
 import { fromBuffer } from 'file-type';
-import { ProbedImageSize } from './getImageSize';
-import fileExists from './fileExists';
+import fs from 'fs';
+import sanitize from 'sanitize-filename';
+import sharp from 'sharp';
 import { SanitizedCollectionConfig } from '../collections/config/types';
-import { FileSizes, ImageSize } from './types';
 import { PayloadRequest } from '../express/types';
+import fileExists from './fileExists';
+import { ProbedImageSize } from './getImageSize';
+import { FileSizes, ImageSize } from './types';
 
 type Args = {
   req: PayloadRequest
@@ -50,7 +50,7 @@ export default async function resizeAndSave({
   const sizes = imageSizes
     .filter((desiredSize) => needsResize(desiredSize, dimensions))
     .map(async (desiredSize) => {
-      let resized = await sharp(file).resize(desiredSize);
+      let resized = sharp(file).resize(desiredSize);
 
       if (desiredSize.formatOptions) {
         resized = resized.toFormat(desiredSize.formatOptions.format, desiredSize.formatOptions.options);

src/uploads/uploadFile.ts

@@ -1,18 +1,18 @@
+import { fromBuffer } from 'file-type';
 import mkdirp from 'mkdirp';
 import path from 'path';
-import sharp, { Sharp } from 'sharp';
-import { fromBuffer } from 'file-type';
 import sanitize from 'sanitize-filename';
-import { SanitizedConfig } from '../config/types';
+import sharp, { Sharp } from 'sharp';
 import { Collection } from '../collections/config/types';
+import { SanitizedConfig } from '../config/types';
 import { FileUploadError, MissingFile } from '../errors';
 import { PayloadRequest } from '../express/types';
-import { FileData } from './types';
-import saveBufferToFile from './saveBufferToFile';
-import getSafeFileName from './getSafeFilename';
 import getImageSize from './getImageSize';
+import getSafeFileName from './getSafeFilename';
 import resizeAndSave from './imageResizer';
 import isImage from './isImage';
+import saveBufferToFile from './saveBufferToFile';
+import { FileData } from './types';
 
 type Args = {
   config: SanitizedConfig,
@@ -103,7 +103,7 @@ const uploadFile = async ({
               dimensions,
               staticPath,
               config: collectionConfig,
-              savedFilename: fsSafeName,
+              savedFilename: fsSafeName || file.name,
               mimeType: fileData.mimeType,
             });
           }