admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 11:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Webflow Trigger Node): Reduce chance of webhook duplication and add credential test (#3594)

Browse Source 
* upstream merge

* ⚡ additional check for webhook, credentials update

* 🔥 Remove unnecessary condition

* ⚡ Change credential injection to generic type

* 👕 Fix linting issue

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
This commit is contained in:
Michael Kret
2022-07-04 11:44:26 +03:00
committed by GitHub
parent 13c3b41c81
commit 224e008fb6
4 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/nodes-base/nodes/Webflow/GenericFunctions.ts
View File

@@ -12,7 +12,6 @@ import {
import {
IDataObject,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
export async function webflowApiRequest(
@@ -24,7 +23,17 @@ export async function webflowApiRequest(
uri?: string,
option: IDataObject = {},
) {
const authenticationMethod = this.getNodeParameter('authentication', 0);
const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken');
let credentialsType = '';
if (authenticationMethod === 'accessToken') {
credentialsType = 'webflowApi';
}
if (authenticationMethod === 'oAuth2') {
credentialsType = 'webflowOAuth2Api';
}
let options: OptionsWithUri = {
headers: {
@@ -46,15 +55,7 @@ export async function webflowApiRequest(
delete options.body;
}
try {
if (authenticationMethod === 'accessToken') {
const credentials = await this.getCredentials('webflowApi');
options.headers!['authorization'] = `Bearer ${credentials.accessToken}`;
return await this.helpers.request!(options);
} else {
return await this.helpers.requestOAuth2!.call(this, 'webflowOAuth2Api', options);
}
return await this.helpers.requestWithAuthentication.call(this, credentialsType, options);
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}

22
packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
View File

@@ -208,18 +208,22 @@ export class WebflowTrigger implements INodeType {
default: {
async checkExists(this: IHookFunctions): Promise<boolean> {
const webhookData = this.getWorkflowStaticData('node');
const webhookUrl = this.getNodeWebhookUrl('default');
const siteId = this.getNodeParameter('site') as string;
if (webhookData.webhookId === undefined) {
return false;
const event = this.getNodeParameter('event') as string;
const registeredWebhooks = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/webhooks`) as IDataObject[];
for (const webhook of registeredWebhooks) {
if (webhook.url === webhookUrl && webhook.triggerType === event) {
webhookData.webhookId = webhook._id;
return true;
}
}
const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
try {
await webflowApiRequest.call(this, 'GET', endpoint);
} catch (error) {
return false;
}
return true;
return false;
},
async create(this: IHookFunctions): Promise<boolean> {
const webhookUrl = this.getNodeWebhookUrl('default');
const webhookData = this.getWorkflowStaticData('node');