mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 12:44:07 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(HTTP Request Node): fix oauth credentials not working properly for some predefined credentials (#4277)

Browse source
This commit is contained in:
Jonathan Bennetts 2022-10-11 08:49:51 +01:00 committed by GitHub
parent a2a397e980
commit aa6c786041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
View file

@ -1,4 +1,4 @@
import { INodeExecutionData } from 'n8n-workflow';
import { INodeExecutionData, IOAuth2Options } from 'n8n-workflow';
export const replaceNullValues = (item: INodeExecutionData) => {
if (item.json === null) {
@ -6,3 +6,65 @@ export const replaceNullValues = (item: INodeExecutionData) => {
}
return item;
};
export const getOAuth2AdditionalParameters = (nodeCredentialType: string) => {
const oAuth2Options: { [credentialType: string]: IOAuth2Options } = {
bitlyOAuth2Api: {
tokenType: 'Bearer',
},
boxOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
ciscoWebexOAuth2Api: {
tokenType: 'Bearer',
},
clickUpOAuth2Api: {
keepBearer: false,
tokenType: 'Bearer',
},
goToWebinarOAuth2Api: {
tokenExpiredStatusCode: 403,
},
hubspotDeveloperApi: {
tokenType: 'Bearer',
includeCredentialsOnRefreshOnBody: true,
},
hubspotOAuth2Api: {
tokenType: 'Bearer',
includeCredentialsOnRefreshOnBody: true,
},
lineNotifyOAuth2Api: {
tokenType: 'Bearer',
},
linkedInOAuth2Api: {
tokenType: 'Bearer',
},
mailchimpOAuth2Api: {
tokenType: 'Bearer',
},
mauticOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
microsoftDynamicsOAuth2Api: {
property: 'id_token',
},
philipsHueOAuth2Api: {
tokenType: 'Bearer',
},
raindropOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
shopifyOAuth2Api: {
tokenType: 'Bearer',
keyToIncludeInAccessTokenHeader: 'X-Shopify-Access-Token',
},
slackOAuth2Api: {
tokenType: 'Bearer',
property: 'authed_user.access_token',
},
stravaOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
};
return oAuth2Options[nodeCredentialType];
};

23
packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
View file

@ -6,13 +6,12 @@ import {
INodeType,
INodeTypeBaseDescription,
INodeTypeDescription,
IOAuth2Options,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
import { OptionsWithUri } from 'request';
import { replaceNullValues } from '../GenericFunctions';
import { getOAuth2AdditionalParameters, replaceNullValues } from '../GenericFunctions';
interface OptionData {
name: string;
@ -1010,25 +1009,7 @@ export class HttpRequestV2 implements INodeType {
requestPromises.push(request);
}
} else if (authentication === 'predefinedCredentialType' && nodeCredentialType) {
const oAuth2Options: { [credentialType: string]: IOAuth2Options } = {
clickUpOAuth2Api: {
keepBearer: false,
tokenType: 'Bearer',
},
slackOAuth2Api: {
tokenType: 'Bearer',
property: 'authed_user.access_token',
},
boxOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
shopifyOAuth2Api: {
tokenType: 'Bearer',
keyToIncludeInAccessTokenHeader: 'X-Shopify-Access-Token',
},
};
const additionalOAuth2Options = oAuth2Options[nodeCredentialType];
const additionalOAuth2Options = getOAuth2AdditionalParameters(nodeCredentialType);
// service-specific cred: OAuth1, OAuth2, plain
const requestWithAuthentication = this.helpers.requestWithAuthentication.call(

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

@ -6,14 +6,13 @@ import {
INodeType,
INodeTypeBaseDescription,
INodeTypeDescription,
IOAuth2Options,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
import { OptionsWithUri } from 'request-promise-native';
import { replaceNullValues } from '../GenericFunctions';
import { getOAuth2AdditionalParameters, replaceNullValues } from '../GenericFunctions';
export class HttpRequestV3 implements INodeType {
description: INodeTypeDescription;
@ -1145,25 +1144,7 @@ export class HttpRequestV3 implements INodeType {
requestPromises.push(request);
}
} else if (authentication === 'predefinedCredentialType' && nodeCredentialType) {
const oAuth2Options: { [credentialType: string]: IOAuth2Options } = {
clickUpOAuth2Api: {
keepBearer: false,
tokenType: 'Bearer',
},
slackOAuth2Api: {
tokenType: 'Bearer',
property: 'authed_user.access_token',
},
boxOAuth2Api: {
includeCredentialsOnRefreshOnBody: true,
},
shopifyOAuth2Api: {
tokenType: 'Bearer',
keyToIncludeInAccessTokenHeader: 'X-Shopify-Access-Token',
},
};
const additionalOAuth2Options = oAuth2Options[nodeCredentialType];
const additionalOAuth2Options = getOAuth2AdditionalParameters(nodeCredentialType);
// service-specific cred: OAuth1, OAuth2, plain
@ -1232,7 +1213,7 @@ export class HttpRequestV3 implements INodeType {
} else {
responseFormat = 'text';
const data = Buffer.from(response.body).toString();
response.body = (!data) ? undefined : data;
response.body = !data ? undefined : data;
}
}