NXJS-218: fix multipart/form-data handling

nuxeo · Jan 7, 2025 · 4dc1151 · 4dc1151
1 parent f7ba568
commit 4dc1151
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lib/operation.js b/lib/operation.js
@@ -108,19 +108,22 @@ class Operation extends Base {
    */
   execute(opts = {}) {
     const options = this._computeOptions(opts);
-    options.headers = options.headers || {};
-    options.headers['Content-Type'] = this._computeContentTypeHeader(this._automationParams.input);
+    const body = this._computeRequestBody();
+    const headers = this._computeRequestHeaders(body);
+    const url = this._computeRequestURL();
     let finalOptions = {
+      body,
+      headers,
+      url,
       method: 'POST',
-      url: this._computeRequestURL(),
-      body: this._computeRequestBody(),
     };
     finalOptions = extend(true, finalOptions, options);
     return this._nuxeo.http(finalOptions);
   }
 
-  _computeContentTypeHeader(input) {
-    return this._isMultipartInput(input) ? 'multipart/form-data' : 'application/json';
+  _computeRequestHeaders(body) {
+    const contentType = body instanceof FormData ? body.getHeaders()['content-type'] : 'application/json';
+    return { 'Content-Type': contentType };
   }
 
   _computeRequestURL() {
@@ -167,7 +170,7 @@ class Operation extends Base {
             context: this._automationParams.context,
           };
           const form = new FormData();
-          form.append('params', JSON.stringify(automationParams));
+          form.append('params', JSON.stringify(automationParams), { contentType: 'application/json' });
 
           let inputIndex = 0;
           for (const blob of input) {
@@ -186,7 +189,7 @@ class Operation extends Base {
         context: this._automationParams.context,
       };
       const form = new FormData();
-      form.append('params', JSON.stringify(automationParams));
+      form.append('params', JSON.stringify(automationParams), { contentType: 'application/json' });
       form.append('input', input.content, input.name);
       return form;
     }