Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Cal Trigger Node): Update to support v2 webhooks #5331

Merged
merged 5 commits into from
Mar 8, 2023
Merged

fix(Cal Trigger Node): Update to support v2 webhooks #5331

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f75f406
fixes webhook endpoint
alishaz-polymath Feb 2, 2023
9cf9ee8
added light versioning
alishaz-polymath Feb 21, 2023
839a881
Merge branch 'n8n-io:master' into master
alishaz-polymath Feb 21, 2023
017ee1a
Merge branch 'master' of https://github.com/alishaz-polymath/n8n
alishaz-polymath Feb 21, 2023
8466475
Merge branch 'n8n-io:master' into master
alishaz-polymath Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 65 additions & 4 deletions packages/nodes-base/nodes/Cal/CalTrigger.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class CalTrigger implements INodeType {
name: 'calTrigger',
icon: 'file:cal.svg',
group: ['trigger'],
version: 1,
version: [1, 2],
subtitle: '=Events: {{$parameter["events"].join(", ")}}',
description: 'Handle Cal events via webhooks',
defaults: {
Expand Down Expand Up @@ -59,10 +59,59 @@ export class CalTrigger implements INodeType {
value: 'BOOKING_RESCHEDULED',
description: 'Receive notifications when a Cal event is rescheduled',
},
{
name: 'Meeting Ended',
value: 'MEETING_ENDED',
description: 'Receive notifications when a Cal event or meeting has ended',
},
],
default: [],
required: true,
},
{
displayName: 'API Version',
name: 'version',
type: 'options',
displayOptions: {
show: {
'@version': [1],
},
},
isNodeSetting: true,
options: [
{
name: 'Before v2.0',
value: 1,
},
{
name: 'v2.0 Onwards',
value: 2,
},
],
default: 1,
},
{
displayName: 'API Version',
name: 'version',
type: 'options',
displayOptions: {
show: {
'@version': [2],
},
},
isNodeSetting: true,
options: [
{
name: 'Before v2.0',
value: 1,
},
{
name: 'v2.0 Onwards',
value: 2,
},
],
default: 2,
},
{
displayName: 'Options',
name: 'options',
Expand Down Expand Up @@ -125,13 +174,17 @@ export class CalTrigger implements INodeType {
webhookMethods = {
default: {
async checkExists(this: IHookFunctions): Promise<boolean> {
const version = this.getNodeParameter('version', 0) as number;
const webhookUrl = this.getNodeWebhookUrl('default');
const webhookData = this.getWorkflowStaticData('node');
const events = this.getNodeParameter('events') as string;

// Check all the webhooks which exist already if it is identical to the
// one that is supposed to get created.
const data = await calApiRequest.call(this, 'GET', '/hooks', {});
const data =
version === 2
? await calApiRequest.call(this, 'GET', '/webhooks', {})
: await calApiRequest.call(this, 'GET', '/hooks', {});

for (const webhook of data.webhooks) {
if (webhook.subscriberUrl === webhookUrl) {
Expand All @@ -148,6 +201,7 @@ export class CalTrigger implements INodeType {
return false;
},
async create(this: IHookFunctions): Promise<boolean> {
const version = this.getNodeParameter('version', 0) as number;
const webhookData = this.getWorkflowStaticData('node');
const subscriberUrl = this.getNodeWebhookUrl('default');
const eventTriggers = this.getNodeParameter('events') as string;
Expand All @@ -161,7 +215,10 @@ export class CalTrigger implements INodeType {
...(options as object),
};

const responseData = await calApiRequest.call(this, 'POST', '/hooks', body);
const responseData =
version === 2
? await calApiRequest.call(this, 'POST', '/webhooks', body)
: await calApiRequest.call(this, 'POST', '/hooks', body);

if (responseData.webhook.id === undefined) {
// Required data is missing so was not successful
Expand All @@ -172,9 +229,13 @@ export class CalTrigger implements INodeType {
return true;
},
async delete(this: IHookFunctions): Promise<boolean> {
const version = this.getNodeParameter('version', 0) as number;
const webhookData = this.getWorkflowStaticData('node');
if (webhookData.webhookId !== undefined) {
const endpoint = `/hooks/${webhookData.webhookId}`;
const endpoint =
version === 2
? `/webhooks/${webhookData.webhookId}`
: `/hooks/${webhookData.webhookId}`;

try {
await calApiRequest.call(this, 'DELETE', endpoint);
Expand Down