mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 06:34:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'feature/extend-http-request' of https://github.com/RicardoE105/n8n into RicardoE105-feature/extend-http-request

Browse source
This commit is contained in:
Jan Oberhauser 2020-03-30 09:22:38 +02:00
parent f2f44aae3d bce40148a6
commit ff2cee467e
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/nodes-base/nodes/HttpRequest.node.ts
View file

@ -7,6 +7,7 @@ import {
INodeExecutionData, INodeExecutionData,
INodeType, INodeType,
INodeTypeDescription, INodeTypeDescription,
IBinaryData,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { OptionsWithUri } from 'request'; import { OptionsWithUri } from 'request';
@ -636,10 +637,15 @@ export class HttpRequest implements INodeType {
const sendBinaryData = this.getNodeParameter('sendBinaryData', itemIndex, false) as boolean; const sendBinaryData = this.getNodeParameter('sendBinaryData', itemIndex, false) as boolean;
if (sendBinaryData === true) { if (sendBinaryData === true) {
if (options.bodyContentType !== 'raw') { const contentTypesAllowed = [
'raw',
'multipart-form-data',
];
if (!contentTypesAllowed.includes(options.bodyContentType as string)) {
// As n8n-workflow.NodeHelpers.getParamterResolveOrder can not be changed // As n8n-workflow.NodeHelpers.getParamterResolveOrder can not be changed
// easily to handle parameters in dot.notation simply error for now. // easily to handle parameters in dot.notation simply error for now.
throw new Error('Sending binary data is only supported when option "Body Content Type" is set to "RAW/CUSTOM"!'); throw new Error('Sending binary data is only supported when option "Body Content Type" is set to "RAW/CUSTOM" and "FORM-DATA/MULTIPART"!');
} }
const item = items[itemIndex]; const item = items[itemIndex];
@ -653,7 +659,22 @@ export class HttpRequest implements INodeType {
throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`); throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
} }
requestOptions.body = Buffer.from(item.binary[binaryPropertyName].data, BINARY_ENCODING); const binaryProperty = item.binary[binaryPropertyName] as IBinaryData;
if (options.bodyContentType === 'raw') {
requestOptions.body = Buffer.from(binaryProperty.data, BINARY_ENCODING);
}
if (options.bodyContentType === 'multipart-form-data') {
requestOptions.body = {
file: {
value: Buffer.from(binaryProperty.data, BINARY_ENCODING),
options: {
filename: binaryProperty.fileName,
contentType: binaryProperty.mimeType,
},
}
};
}
continue; continue;
} }
} }