fix(upload-client): send content-type header when uploading multipa…

…rt (#461) * fix(upload-client): send `content-type` header when uploading multipart * chore(upload-client): use conditional assignment
uploadcare · Jan 20, 2023 · 3a402a3 · 3a402a3
1 parent e140644
commit 3a402a3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/upload-client/src/api/multipartUpload.ts b/packages/upload-client/src/api/multipartUpload.ts
@@ -2,13 +2,14 @@ import { MultipartPart } from './multipartStart'
 
 import request from '../request/request.node'
 
-import defaultSettings from '../defaultSettings'
+import defaultSettings, { defaultContentType } from '../defaultSettings'
 import { retryIfFailed } from '../tools/retryIfFailed'
 import { SupportedFileInput } from '../types'
 import { ComputableProgressInfo, ProgressCallback } from './types'
 
 export type MultipartUploadOptions = {
   publicKey?: string
+  contentType?: string
   signal?: AbortSignal
   onProgress?: ProgressCallback<ComputableProgressInfo>
   integration?: string
@@ -28,6 +29,7 @@ export default function multipartUpload(
   part: SupportedFileInput,
   url: MultipartPart,
   {
+    contentType,
     signal,
     onProgress,
     retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes,
@@ -42,7 +44,10 @@ export default function multipartUpload(
         data: part,
         // Upload request can't be non-computable because we always know exact size
         onProgress: onProgress as ProgressCallback,
-        signal
+        signal,
+        headers: {
+          'Content-Type': contentType || defaultContentType
+        }
       })
         .then((result) => {
           // hack for node ¯\_(ツ)_/¯

diff --git a/packages/upload-client/src/uploadFile/uploadMultipart.ts b/packages/upload-client/src/uploadFile/uploadMultipart.ts
@@ -48,6 +48,7 @@ const uploadPart = (
   url: string,
   {
     publicKey,
+    contentType,
     onProgress,
     signal,
     integration,
@@ -57,6 +58,7 @@ const uploadPart = (
 ): Promise<MultipartUploadResponse> =>
   multipartUpload(chunk, url, {
     publicKey,
+    contentType,
     onProgress,
     signal,
     integration,
@@ -121,9 +123,11 @@ export const uploadMultipart = async (
     }
   }
 
+  contentType ||= getContentType(file)
+
   return multipartStart(size, {
     publicKey,
-    contentType: contentType || getContentType(file),
+    contentType,
     fileName: fileName || getFileName(file),
     baseURL,
     secureSignature,
@@ -147,6 +151,7 @@ export const uploadMultipart = async (
             (url, index) => (): Promise<MultipartUploadResponse> =>
               uploadPart(getChunk(index), url, {
                 publicKey,
+                contentType,
                 onProgress: createProgressHandler(parts.length, index),
                 signal,
                 integration,