mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(HTTP Request Node): Correctly doesn't redirect on non GET method (#6132)

Browse source 
Fixed ingnored parameter for redirect
This commit is contained in:
agobrech 2023-05-04 09:55:35 +02:00 committed by GitHub
parent 5d77ec76e3
commit 3f5c606254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ export class HttpRequest extends VersionedNodeType {
group: ['output'], group: ['output'],
subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}', subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
description: 'Makes an HTTP request and returns the response data', description: 'Makes an HTTP request and returns the response data',
defaultVersion: 4, defaultVersion: 4.1,
}; };
const nodeVersions: IVersionedNodeType['nodeVersions'] = { const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@ -22,6 +22,7 @@ export class HttpRequest extends VersionedNodeType {
2: new HttpRequestV2(baseDescription), 2: new HttpRequestV2(baseDescription),
3: new HttpRequestV3(baseDescription), 3: new HttpRequestV3(baseDescription),
4: new HttpRequestV3(baseDescription), 4: new HttpRequestV3(baseDescription),
4.1: new HttpRequestV3(baseDescription),
}; };
super(nodeVersions, baseDescription); super(nodeVersions, baseDescription);

9
packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
View file

@ -39,7 +39,7 @@ export class HttpRequestV3 implements INodeType {
this.description = { this.description = {
...baseDescription, ...baseDescription,
subtitle: '={{$parameter["method"] + ": " + $parameter["url"]}}', subtitle: '={{$parameter["method"] + ": " + $parameter["url"]}}',
version: [3, 4], version: [3, 4, 4.1],
defaults: { defaults: {
name: 'HTTP Request', name: 'HTTP Request',
color: '#2200DD', color: '#2200DD',
@ -1104,6 +1104,11 @@ export class HttpRequestV3 implements INodeType {
if (autoDetectResponseFormat || fullResponse) { if (autoDetectResponseFormat || fullResponse) {
requestOptions.resolveWithFullResponse = true; requestOptions.resolveWithFullResponse = true;
} }
if (requestOptions.method !== 'GET' && nodeVersion >= 4.1) {
requestOptions = { ...requestOptions, followAllRedirects: false };
}
const defaultRedirect = nodeVersion >= 4 && redirect === undefined; const defaultRedirect = nodeVersion >= 4 && redirect === undefined;
if (redirect?.redirect?.followRedirects || defaultRedirect) { if (redirect?.redirect?.followRedirects || defaultRedirect) {
@ -1129,7 +1134,6 @@ export class HttpRequestV3 implements INodeType {
// set default timeout to 1 hour // set default timeout to 1 hour
requestOptions.timeout = 3600000; requestOptions.timeout = 3600000;
} }
if (sendQuery && queryParameterArrays) { if (sendQuery && queryParameterArrays) {
Object.assign(requestOptions, { Object.assign(requestOptions, {
qsStringifyOptions: { arrayFormat: queryParameterArrays }, qsStringifyOptions: { arrayFormat: queryParameterArrays },
@ -1346,7 +1350,6 @@ export class HttpRequestV3 implements INodeType {
'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, image/*;q=0.8, */*;q=0.7'; 'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, image/*;q=0.8, */*;q=0.7';
} }
} }
try { try {
this.sendMessageToUI(sanitizeUiMessage(requestOptions, authDataKeys)); this.sendMessageToUI(sanitizeUiMessage(requestOptions, authDataKeys));
} catch (e) {} } catch (e) {}