Merge branch 'Master' into 'Pipedrive-OAuth2-support'

packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts

@@ -14,7 +14,6 @@ import {
 	gitlabApiRequest,
 } from './GenericFunctions';
 
-
 export class GitlabTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Gitlab Trigger',
@@ -34,7 +33,25 @@ export class GitlabTrigger implements INodeType {
 			{
 				name: 'gitlabApi',
 				required: true,
-			}
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'gitlabOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
 		],
 		webhooks: [
 			{
@@ -45,6 +62,23 @@ export class GitlabTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Repository Owner',
 				name: 'owner',
@@ -135,7 +169,10 @@ export class GitlabTrigger implements INodeType {
 				// Webhook got created before so check if it still exists
 				const owner = this.getNodeParameter('owner') as string;
 				const repository = this.getNodeParameter('repository') as string;
-				const endpoint = `/projects/${owner}%2F${repository}/hooks/${webhookData.webhookId}`;
+
+				const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+
+				const endpoint = `/projects/${path}/hooks/${webhookData.webhookId}`;
 
 				try {
 					await gitlabApiRequest.call(this, 'GET', endpoint, {});
@@ -175,15 +212,22 @@ export class GitlabTrigger implements INodeType {
 					events[`${e}_events`] = true;
 				}
 
-				const endpoint = `/projects/${owner}%2F${repository}/hooks`;
+				// gitlab set the push_events to true when the field it's not sent.
+				// set it to false when it's not picked by the user.
+				if (events['push_events'] === undefined) {
+					events['push_events'] = false;
+				}
+
+				const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+
+				const endpoint = `/projects/${path}/hooks`;
 
 				const body = {
 					url: webhookUrl,
-					events,
+					...events,
 					enable_ssl_verification: false,
 				};
 
-
 				let responseData;
 				try {
 					responseData = await gitlabApiRequest.call(this, 'POST', endpoint, body);
@@ -208,7 +252,10 @@ export class GitlabTrigger implements INodeType {
 				if (webhookData.webhookId !== undefined) {
 					const owner = this.getNodeParameter('owner') as string;
 					const repository = this.getNodeParameter('repository') as string;
-					const endpoint = `/projects/${owner}%2F${repository}/hooks/${webhookData.webhookId}`;
+
+					const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+
+					const endpoint = `/projects/${path}/hooks/${webhookData.webhookId}`;
 					const body = {};
 
 					try {