fixed multiple File/Blob arrayvalues in the object->FormData transfor…

…mation
pocketbase · Aug 27, 2023 · 14ab4c5 · 14ab4c5
1 parent 14b816b
commit 14ab4c5
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.17.2
+
+- Fixed mulitple File/Blob array values not transformed properly to their FormData equivalent when an object syntax is used.
+
+
 ## 0.17.1
 
 - Fixed typo in the deprecation console.warn messages ([#235](https://github.com/pocketbase/js-sdk/pull/235); thanks @heloineto).

diff --git a/dist/pocketbase.cjs.js b/dist/pocketbase.cjs.js
diff --git a/dist/pocketbase.cjs.js.map b/dist/pocketbase.cjs.js.map
diff --git a/dist/pocketbase.es.js b/dist/pocketbase.es.js
diff --git a/dist/pocketbase.es.js.map b/dist/pocketbase.es.js.map
diff --git a/dist/pocketbase.es.mjs b/dist/pocketbase.es.mjs
diff --git a/dist/pocketbase.es.mjs.map b/dist/pocketbase.es.mjs.map
diff --git a/dist/pocketbase.iife.js b/dist/pocketbase.iife.js
diff --git a/dist/pocketbase.iife.js.map b/dist/pocketbase.iife.js.map
diff --git a/dist/pocketbase.umd.js b/dist/pocketbase.umd.js
diff --git a/dist/pocketbase.umd.js.map b/dist/pocketbase.umd.js.map
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.17.1",
+    "version": "0.17.2",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

diff --git a/src/Client.ts b/src/Client.ts
@@ -442,7 +442,10 @@ export default class Client {
         const form = new FormData();
 
         for (let key in body) {
-            form.append(key, body[key]);
+            const values = Array.isArray(body[key]) ? body[key] : [body[key]];
+            for (let val of values) {
+                form.append(key, val);
+            }
         }
 
         return form;

diff --git a/tests/Client.spec.ts b/tests/Client.spec.ts
@@ -193,7 +193,7 @@ describe('Client', function() {
                 method:    'GET',
                 url:       'test_base_url/multipart',
                 additionalMatcher: (_, config: any): boolean => {
-                    // multipart/form-data requests doesn't have explicitly set Content-Type
+                        // multipart/form-data requests shouldn't have explicitly set Content-Type
                     return !config?.headers?.['Content-Type'];
                 },
                 replyCode: 200,
@@ -204,12 +204,23 @@ describe('Client', function() {
                 method:    'GET',
                 url:       'test_base_url/multipartAuto',
                 additionalMatcher: (_, config: any): boolean => {
-                    return (
-                        // multipart/form-data requests doesn't have explicitly set Content-Type
-                        !config?.headers?.['Content-Type'] &&
+                    if (
+                        // multipart/form-data requests shouldn't have explicitly set Content-Type
+                        config?.headers?.['Content-Type'] ||
                         // the body should have been converted to FormData
-                        config.body instanceof FormData
-                    );
+                        !(config.body instanceof FormData)
+                    ) {
+                        return false;
+                    }
+
+                    // check FormData transformation
+                    assert.deepEqual(config.body.getAll('title'), ['test']);
+                    assert.deepEqual(config.body.getAll('roles'), ['a', 'b']);
+                    assert.equal(config.body.getAll('files').length, 2);
+                    assert.equal(config.body.getAll('files')[0].size, 2);
+                    assert.equal(config.body.getAll('files')[1].size, 1);
+
+                    return true;
                 },
                 replyCode: 200,
                 replyBody: 'successMultipartAuto',
@@ -222,7 +233,11 @@ describe('Client', function() {
                 [client.send('/123', { method: 'PATCH' }), 'successPatch'],
                 [client.send('/123', { method: 'DELETE' }), 'successDelete'],
                 [client.send('/multipart', { method: 'GET', body: new FormData() }), 'successMultipart'],
-                [client.send('/multipartAuto', { method: 'GET', body: {title: "test", file: new Blob([])} }), 'successMultipartAuto'],
+                [client.send('/multipartAuto', { method: 'GET', body: {
+                    title: "test",
+                    roles: ["a", "b"],
+                    files: [new Blob(['11']), new Blob(['2'])]},
+                }), 'successMultipartAuto'],
             ];
             for (let testCase of testCases) {
                 const responseData = await testCase[0]