content disposition helper

pingdotgg · Feb 6, 2024 · 01d6685 · 01d6685
1 parent 95ad0af
commit 01d6685
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/packages/shared/src/utils.ts b/packages/shared/src/utils.ts
@@ -4,6 +4,7 @@ import { lookup } from "@uploadthing/mime-types";
 
 import type { AllowedFileType } from "./file-types";
 import type {
+  ContentDisposition,
   ExpandedRouteConfig,
   FetchEsque,
   FileData,
@@ -247,3 +248,15 @@ export function objectKeys<T extends Record<string, unknown>>(
 export function isObject(obj: unknown): obj is Record<string, unknown> {
   return typeof obj === "object" && obj !== null && !Array.isArray(obj);
 }
+
+/** construct content-disposition header */
+export function contentDisposition(
+  contentDisposition: ContentDisposition,
+  fileName: string,
+) {
+  return [
+    contentDisposition,
+    `filename="${encodeURI(fileName)}"`,
+    `filename*=UTF-8''${encodeURI(fileName)}`,
+  ].join("; ");
+}
diff --git a/packages/uploadthing/src/internal/multi-part.ts b/packages/uploadthing/src/internal/multi-part.ts
@@ -1,4 +1,8 @@
-import { generateUploadThingURL, UploadThingError } from "@uploadthing/shared";
+import {
+  contentDisposition,
+  generateUploadThingURL,
+  UploadThingError,
+} from "@uploadthing/shared";
 import type { ContentDisposition, FetchEsque } from "@uploadthing/shared";
 
 import { maybeParseResponseXML } from "./s3-error-parser";
@@ -26,11 +30,10 @@ export async function uploadPart(
     body: opts.chunk,
     headers: {
       "Content-Type": opts.contentType,
-      "Content-Disposition": [
+      "Content-Disposition": contentDisposition(
         opts.contentDisposition,
-        `filename="${encodeURI(opts.fileName)}"`,
-        `filename*=UTF-8''${encodeURI(opts.fileName)}`,
-      ].join("; "),
+        opts.fileName,
+      ),
     },
   });
 
@@ -99,11 +102,7 @@ export async function uploadPartWithProgress(
     xhr.setRequestHeader("Content-Type", opts.fileType);
     xhr.setRequestHeader(
       "Content-Disposition",
-      [
-        opts.contentDisposition,
-        `filename="${encodeURI(opts.fileName)}"`,
-        `filename*=UTF-8''${encodeURI(opts.fileName)}`,
-      ].join("; "),
+      contentDisposition(opts.contentDisposition, opts.fileName),
     );
 
     xhr.onload = async () => {