Skip to content

Commit 48f1c7d

Browse files
committed
Adjusting form data checking
1 parent f479969 commit 48f1c7d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

components/frontapp/common/utils.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function buildFormData(formData, data, parentKey) {
8989
buildFormData(formData, data[key], parentKey && `${parentKey}[${key}]` || key);
9090
});
9191

92-
} else if (data && parentKey.includes("attachment")) {
92+
} else if (data && parentKey?.includes("attachment")) {
9393
formData.append(parentKey, createReadStream(data));
9494

9595
} else if (data) {

components/frontapp/frontapp.app.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ export default {
314314
return url || `${constants.BASE_URL}${path}`;
315315
},
316316
hasMultipartHeader(headers) {
317-
return headers && headers["Content-Type"].includes("multipart/form-data");
317+
return headers?.["Content-Type"]?.includes("multipart/form-data");
318318
},
319319
getHeaders(headers) {
320320
return {
@@ -328,7 +328,10 @@ export default {
328328
headers, path, url, data: originalData, ...args
329329
} = {}) {
330330
const hasMultipartHeader = this.hasMultipartHeader(headers);
331-
const data = hasMultipartHeader && utils.getFormData(originalData) || originalData;
331+
const isFormData = originalData instanceof FormData;
332+
const data = (!isFormData && hasMultipartHeader)
333+
? utils.getFormData(originalData)
334+
: originalData;
332335
const currentHeaders = this.getHeaders(headers);
333336
const builtHeaders = hasMultipartHeader
334337
? {

0 commit comments

Comments
 (0)