Merge a44ee58 into 7ab02af

Esri · Aug 9, 2018 · 8058168 · 8058168
2 parents 7ab02af + a44ee58
commit 8058168
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/packages/arcgis-rest-request/src/utils/encode-form-data.ts b/packages/arcgis-rest-request/src/utils/encode-form-data.ts
@@ -15,9 +15,15 @@ export function encodeFormData(params: any): FormData | string {
   if (useFormData) {
     const formData = new FormData();
     Object.keys(newParams).forEach((key: any) => {
-      if (key === "file" && newParams[key].name) {
-        // Pass on the file's name if provided to override defaults such as "blob"
+      if (typeof File !== "undefined" && newParams[key] instanceof File) {
+        // Pass on the file's name to override defaults such as "blob"
         formData.append(key, newParams[key], newParams[key].name);
+      } else if (
+        typeof Blob !== "undefined" &&
+        newParams[key] instanceof Blob
+      ) {
+        // Pass on the key as the file name to override defaults such as "blob"
+        formData.append(key, newParams[key], key);
       } else {
         formData.append(key, newParams[key]);
       }

diff --git a/packages/arcgis-rest-request/test/utils/encode-form-data.test.ts b/packages/arcgis-rest-request/test/utils/encode-form-data.test.ts
@@ -6,17 +6,40 @@ import {
 import { attachmentFile } from "../../../arcgis-rest-feature-service/test/attachments.test";
 
 describe("encodeFormData", () => {
-  it("should encode in form data for multipart requests", () => {
+  it("should encode in form data for multipart file requests", () => {
     const binaryObj =
       typeof File !== "undefined"
         ? new File(["foo"], "foo.txt", {
             type: "text/plain"
           })
-        : new Buffer("");
+        : Buffer.from("");
 
     const formData = encodeFormData({ binary: binaryObj });
 
     expect(formData instanceof FormData).toBeTruthy();
+
+    if (formData instanceof FormData && formData.get) {
+      expect(formData.get("binary") instanceof File).toBeTruthy();
+      expect((formData.get("binary") as File).name).toBe("foo.txt");
+    }
+  });
+
+  it("should encode in form data for multipart blob requests", () => {
+    const binaryObj =
+      typeof Blob !== "undefined"
+        ? new Blob([], {
+            type: "text/plain"
+          })
+        : Buffer.from("");
+
+    const formData = encodeFormData({ binary: binaryObj });
+
+    expect(formData instanceof FormData).toBeTruthy();
+
+    if (formData instanceof FormData && formData.get) {
+      expect(formData.get("binary") instanceof File).toBeTruthy();
+      expect((formData.get("binary") as File).name).toBe("binary");
+    }
   });
 
   it("should encode as query string for basic types", () => {

diff --git a/packages/arcgis-rest-request/test/utils/process-params.test.ts b/packages/arcgis-rest-request/test/utils/process-params.test.ts
@@ -163,7 +163,7 @@ describe("processParams", () => {
         ? new File(["foo"], "foo.txt", {
             type: "text/plain"
           })
-        : new Buffer("");
+        : Buffer.from("");
 
     expect(
       requiresFormData({
@@ -178,7 +178,7 @@ describe("processParams", () => {
         ? new File(["foo"], "foo.txt", {
             type: "text/plain"
           })
-        : new Buffer("");
+        : Buffer.from("");
 
     expect(
       requiresFormData({