From d2b99263d46e8980bc49073d5f41c6ebbf0ed1af Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Sat, 25 Jul 2020 10:10:34 +0200 Subject: [PATCH] :zap: Minor improvements to OAuth1 support in HTTP Request Node --- packages/core/src/NodeExecuteFunctions.ts | 1 - .../credentials/OAuth1Api.credentials.ts | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts index 79b34457a8..804aa5ca2d 100644 --- a/packages/core/src/NodeExecuteFunctions.ts +++ b/packages/core/src/NodeExecuteFunctions.ts @@ -706,7 +706,6 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, tokenType, property); }, requestOAuth1(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUrl | requestPromise.RequestPromiseOptions): Promise { // tslint:disable-line:no-any - console.log(requestOptions); return requestOAuth1.call(this, credentialsType, requestOptions); }, returnJsonArray, diff --git a/packages/nodes-base/credentials/OAuth1Api.credentials.ts b/packages/nodes-base/credentials/OAuth1Api.credentials.ts index d5c18445f0..3999c94377 100644 --- a/packages/nodes-base/credentials/OAuth1Api.credentials.ts +++ b/packages/nodes-base/credentials/OAuth1Api.credentials.ts @@ -7,6 +7,20 @@ export class OAuth1Api implements ICredentialType { name = 'oAuth1Api'; displayName = 'OAuth1 API'; properties = [ + { + displayName: 'Authorization URL', + name: 'authUrl', + type: 'string' as NodePropertyTypes, + default: '', + required: true, + }, + { + displayName: 'Access Token URL', + name: 'accessTokenUrl', + type: 'string' as NodePropertyTypes, + default: '', + required: true, + }, { displayName: 'Consumer Key', name: 'consumerKey', @@ -28,20 +42,6 @@ export class OAuth1Api implements ICredentialType { default: '', required: true, }, - { - displayName: 'Authorization URL', - name: 'authUrl', - type: 'string' as NodePropertyTypes, - default: '', - required: true, - }, - { - displayName: 'Access Token URL', - name: 'accessTokenUrl', - type: 'string' as NodePropertyTypes, - default: '', - required: true, - }, { displayName: 'Signature Method', name: 'signatureMethod',