Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(HTTP Request Node): Duplicate key names support for form data #9040

Merged
merged 3 commits into from
Apr 10, 2024
Merged

fix(HTTP Request Node): Duplicate key names support for form data #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f1f4a6
:zap: fix
michael-radency Apr 3, 2024
867212e
set HttpRequestNode default version to 4.2
maspio Apr 9, 2024
ce3d856
Merge branch 'master' into node-1222-http-request-node-using-duplicat…
maspio Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 23 additions & 1 deletion packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import type {

import set from 'lodash/set';

export type BodyParameter = { name: string; value: string };
import FormData from 'form-data';

export type BodyParameter = {
name: string;
value: string;
parameterType?: 'formBinaryData' | 'formData';
};

export type IAuthDataSanitizeKeys = {
[key: string]: string[];
Expand Down Expand Up @@ -168,6 +174,22 @@ export const prepareRequestBody = async (
set(result, entry.name, entry.value);
return result;
}, Promise.resolve({}));
} else if (bodyType === 'multipart-form-data' && version >= 4.2) {
const formData = new FormData();

for (const parameter of parameters) {
if (parameter.parameterType === 'formBinaryData') {
const entry = await defaultReducer({}, parameter);
const key = Object.keys(entry)[0];
const data = entry[key] as { value: Buffer; options: FormData.AppendOptions };
formData.append(key, data.value, data.options);
continue;
}

formData.append(parameter.name, parameter.value);
}

return formData;
} else {
return await reduceAsync(parameters, defaultReducer);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class HttpRequest extends VersionedNodeType {
group: ['output'],
subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
description: 'Makes an HTTP request and returns the response data',
defaultVersion: 4.1,
defaultVersion: 4.2,
};

const nodeVersions: IVersionedNodeType['nodeVersions'] = {
Expand All @@ -23,6 +23,7 @@ export class HttpRequest extends VersionedNodeType {
3: new HttpRequestV3(baseDescription),
4: new HttpRequestV3(baseDescription),
4.1: new HttpRequestV3(baseDescription),
4.2: new HttpRequestV3(baseDescription),
};

super(nodeVersions, baseDescription);
Expand Down
2 changes: 1 addition & 1 deletion packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class HttpRequestV3 implements INodeType {
this.description = {
...baseDescription,
subtitle: '={{$parameter["method"] + ": " + $parameter["url"]}}',
version: [3, 4, 4.1],
version: [3, 4, 4.1, 4.2],
defaults: {
name: 'HTTP Request',
color: '#0004F5',
Expand Down