Merge remote-tracking branch 'origin/master' into pay-356-enable-new-…

…evaluator-config
n8n-io · Sep 20, 2023 · 98efcbd · 98efcbd
2 parents 17c0030 + 6bc477b
commit 98efcbd
Show file tree

Hide file tree

Showing 11 changed files with 169 additions and 10 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,9 @@
+# Commits of large-scale changes to exclude from `git blame` results
+
+# Set up linting and formatting (#2120)
+
+56c4c6991fb21ba4b7bdcd22c929f63cc1d1defe
+
+# refactor(editor): Apply Prettier (no-changelog) #4920
+
+5ca2148c7ed06c90f999508928b7a51f9ac7a788
diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
@@ -39,6 +39,7 @@ inspect.defaultOptions.customInspect = false;
 require('express-async-errors');
 require('source-map-support').install();
 require('reflect-metadata');
+require('dns').setDefaultResultOrder('ipv4first');
 
 require('@oclif/command')
 	.run()

diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -1,13 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-shadow */
-
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/unbound-method */
 import 'source-map-support/register';
 import 'reflect-metadata';
+import { setDefaultResultOrder } from 'dns';
+setDefaultResultOrder('ipv4first');
+
 import { Container } from 'typedi';
 import type { IProcessMessage } from 'n8n-core';
 import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';

diff --git a/packages/cli/test/integration/credentials.controller.test.ts b/packages/cli/test/integration/credentials.controller.test.ts
@@ -38,8 +38,8 @@ describe('GET /credentials', () => {
 
 			response.body.data.forEach(validateCredential);
 
-			const savedIds = [id1, id2];
-			const returnedIds = response.body.data.map((c) => c.id);
+			const savedIds = [id1, id2].sort();
+			const returnedIds = response.body.data.map((c) => c.id).sort();
 
 			expect(savedIds).toEqual(returnedIds);
 		});

diff --git a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
@@ -0,0 +1,73 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = ['read', 'write', 'issues:create', 'comments:create'];
+
+export class LinearOAuth2Api implements ICredentialType {
+	name = 'linearOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Linear OAuth2 API';
+
+	documentationUrl = 'linear';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://linear.app/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://api.linear.app/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Actor',
+			name: 'actor',
+			type: 'options',
+			options: [
+				{
+					name: 'User',
+					value: 'user',
+					description: 'Resources are created as the user who authorized the application',
+				},
+				{
+					name: 'Application',
+					value: 'application',
+					description: 'Resources are created as the application',
+				},
+			],
+			default: 'user',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: scopes.join(' '),
+			required: true,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '={{"actor="+$self["actor"]}}',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -411,7 +411,16 @@ export class Html implements INodeType {
 			table += '</tbody>';
 			table += '</table>';
 
-			return [[{ json: { table } }]];
+			return [
+				[
+					{
+						json: { table },
+						pairedItem: items.map((_item, index) => ({
+							item: index,
+						})),
+					},
+				],
+			];
 		}
 
 		let item: INodeExecutionData;

diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -14,11 +14,11 @@ import type {
 
 import {
 	BINARY_ENCODING,
-	jsonParse,
 	NodeApiError,
 	NodeOperationError,
-	sleep,
+	jsonParse,
 	removeCircularRefs,
+	sleep,
 } from 'n8n-workflow';
 
 import { keysToLowercase } from '@utils/utilities';
@@ -1152,8 +1152,8 @@ export class HttpRequestV3 implements INodeType {
 			if (timeout) {
 				requestOptions.timeout = timeout;
 			} else {
-				// set default timeout to 1 hour
-				requestOptions.timeout = 3600000;
+				// set default timeout to 5 minutes
+				requestOptions.timeout = 300_000;
 			}
 			if (sendQuery && queryParameterArrays) {
 				Object.assign(requestOptions, {

diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -23,6 +23,7 @@ export async function linearApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const endpoint = 'https://api.linear.app/graphql';
+	const authenticationMethod = this.getNodeParameter('authentication', 0, 'apiToken') as string;
 
 	let options: OptionsWithUri = {
 		headers: {
@@ -35,7 +36,11 @@ export async function linearApiRequest(
 	};
 	options = Object.assign({}, options, option);
 	try {
-		return await this.helpers.requestWithAuthentication.call(this, 'linearApi', options);
+		return await this.helpers.requestWithAuthentication.call(
+			this,
+			authenticationMethod === 'apiToken' ? 'linearApi' : 'linearOAuth2Api',
+			options,
+		);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}

diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -46,9 +46,39 @@ export class Linear implements INodeType {
 				name: 'linearApi',
 				required: true,
 				testedBy: 'linearApiTest',
+				displayOptions: {
+					show: {
+						authentication: ['apiToken'],
+					},
+				},
+			},
+			{
+				name: 'linearOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Token',
+						value: 'apiToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'apiToken',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',

diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -29,6 +29,20 @@ export class LinearTrigger implements INodeType {
 				name: 'linearApi',
 				required: true,
 				testedBy: 'linearApiTest',
+				displayOptions: {
+					show: {
+						authentication: ['apiToken'],
+					},
+				},
+			},
+			{
+				name: 'linearOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		webhooks: [
@@ -40,6 +54,22 @@ export class LinearTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Token',
+						value: 'apiToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'apiToken',
+			},
 			{
 				displayName: 'Team Name or ID',
 				name: 'teamId',

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
@@ -188,6 +188,7 @@
       "dist/credentials/Ldap.credentials.js",
       "dist/credentials/LemlistApi.credentials.js",
       "dist/credentials/LinearApi.credentials.js",
+      "dist/credentials/LinearOAuth2Api.credentials.js",
       "dist/credentials/LineNotifyOAuth2Api.credentials.js",
       "dist/credentials/LingvaNexApi.credentials.js",
       "dist/credentials/LinkedInOAuth2Api.credentials.js",