From 18313e11997b61d845f7755722096baf7a3f1c58 Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Sat, 12 Dec 2020 11:00:57 -0500 Subject: [PATCH] :zap: Now OAuth2 send authentication data in the body (#1241) --- packages/core/src/NodeExecuteFunctions.ts | 4 ++++ .../nodes-base/credentials/MauticOAuth2Api.credentials.ts | 2 +- packages/nodes-base/nodes/Mautic/GenericFunctions.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts index 1006b29100..e6bcbd24cb 100644 --- a/packages/core/src/NodeExecuteFunctions.ts +++ b/packages/core/src/NodeExecuteFunctions.ts @@ -172,6 +172,10 @@ export function requestOAuth2(this: IAllExecuteFunctions, credentialsType: strin client_secret: credentials.clientSecret as string, }; tokenRefreshOptions.body = body; + // Override authorization property so the credentails are not included in it + tokenRefreshOptions.headers = { + Authorization: '', + }; } const newToken = await token.refresh(tokenRefreshOptions); diff --git a/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts index cea3276934..1a9fb99395 100644 --- a/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts +++ b/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts @@ -50,7 +50,7 @@ export class MauticOAuth2Api implements ICredentialType { displayName: 'Authentication', name: 'authentication', type: 'hidden' as NodePropertyTypes, - default: 'header', + default: 'body', }, ]; } diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts index 9ab48b8dd8..d36add52df 100644 --- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts @@ -63,7 +63,7 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions options.uri = `${credentials.url}${options.uri}`; //@ts-ignore - returnData = await this.helpers.requestOAuth2.call(this, 'mauticOAuth2Api', options); + returnData = await this.helpers.requestOAuth2.call(this, 'mauticOAuth2Api', options, { includeCredentialsOnRefreshOnBody: true }); } if (returnData.errors) {