1
1
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-21 09:59:34 +03:00

🔀 Merge master

This commit is contained in:
Iván Ovejero 2021-11-17 10:25:05 +01:00
commit 29a3953dff
30 changed files with 1316 additions and 38 deletions

View File

@ -6,6 +6,8 @@ if [ -d /root/.n8n ] ; then
ln -s /root/.n8n /home/node/
fi
chown -R node /home/node
if [ "$#" -gt 0 ]; then
# Got started with arguments
COMMAND=$1;

View File

@ -11,6 +11,7 @@ import {
CredentialTypes,
Db,
ExternalHooks,
InternalHooksManager,
IWorkflowBase,
IWorkflowExecutionDataProcess,
LoadNodesAndCredentials,
@ -123,6 +124,9 @@ export class Execute extends Command {
const externalHooks = ExternalHooks();
await externalHooks.init();
const instanceId = await UserSettings.getInstanceId();
InternalHooksManager.init(instanceId);
// Add the found types to an instance other parts of the application can use
const nodeTypes = NodeTypes();
await nodeTypes.init(loadNodesAndCredentials.nodeTypes);

View File

@ -28,6 +28,7 @@ import {
CredentialTypes,
Db,
ExternalHooks,
InternalHooksManager,
IWorkflowDb,
IWorkflowExecutionDataProcess,
LoadNodesAndCredentials,
@ -55,12 +56,12 @@ export class ExecuteBatch extends Command {
static executionTimeout = 3 * 60 * 1000;
static examples = [
`$ n8n executeAll`,
`$ n8n executeAll --concurrency=10 --skipList=/data/skipList.txt`,
`$ n8n executeAll --debug --output=/data/output.json`,
`$ n8n executeAll --ids=10,13,15 --shortOutput`,
`$ n8n executeAll --snapshot=/data/snapshots --shallow`,
`$ n8n executeAll --compare=/data/previousExecutionData --retries=2`,
`$ n8n executeBatch`,
`$ n8n executeBatch --concurrency=10 --skipList=/data/skipList.txt`,
`$ n8n executeBatch --debug --output=/data/output.json`,
`$ n8n executeBatch --ids=10,13,15 --shortOutput`,
`$ n8n executeBatch --snapshot=/data/snapshots --shallow`,
`$ n8n executeBatch --compare=/data/previousExecutionData --retries=2`,
];
static flags = {
@ -303,6 +304,9 @@ export class ExecuteBatch extends Command {
const externalHooks = ExternalHooks();
await externalHooks.init();
const instanceId = await UserSettings.getInstanceId();
InternalHooksManager.init(instanceId);
// Add the found types to an instance other parts of the application can use
const nodeTypes = NodeTypes();
await nodeTypes.init(loadNodesAndCredentials.nodeTypes);
@ -813,10 +817,22 @@ export class ExecuteBatch extends Command {
const changes = diff(JSON.parse(contents), data, { keysOnly: true });
if (changes !== undefined) {
// we have structural changes. Report them.
executionResult.error = `Workflow may contain breaking changes`;
executionResult.changes = changes;
executionResult.executionStatus = 'error';
// If we had only additions with no removals
// Then we treat as a warning and not an error.
// To find this, we convert the object to JSON
// and search for the `__deleted` string
const changesJson = JSON.stringify(changes);
if (changesJson.includes('__deleted')) {
// we have structural changes. Report them.
executionResult.error = 'Workflow may contain breaking changes';
executionResult.changes = changes;
executionResult.executionStatus = 'error';
} else {
executionResult.error =
'Workflow contains new data that previously did not exist.';
executionResult.changes = changes;
executionResult.executionStatus = 'warning';
}
} else {
executionResult.executionStatus = 'success';
}

View File

@ -1,6 +1,6 @@
{
"name": "n8n",
"version": "0.148.0",
"version": "0.149.0",
"description": "n8n Workflow Automation Tool",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@ -110,10 +110,10 @@
"localtunnel": "^2.0.0",
"lodash.get": "^4.4.2",
"mysql2": "~2.3.0",
"n8n-core": "~0.92.0",
"n8n-editor-ui": "~0.115.0",
"n8n-nodes-base": "~0.145.0",
"n8n-workflow": "~0.75.0",
"n8n-core": "~0.93.0",
"n8n-editor-ui": "~0.116.0",
"n8n-nodes-base": "~0.146.0",
"n8n-workflow": "~0.76.0",
"oauth-1.0a": "^2.2.6",
"open": "^7.0.0",
"pg": "^8.3.0",

View File

@ -1596,11 +1596,11 @@ class App {
const findQuery = {} as FindManyOptions;
if (req.query.filter) {
findQuery.where = JSON.parse(req.query.filter as string);
if ((findQuery.where! as IDataObject).id !== undefined) {
if (findQuery.where.id !== undefined) {
// No idea if multiple where parameters make db search
// slower but to be sure that that is not the case we
// remove all unnecessary fields in case the id is defined.
findQuery.where = { id: (findQuery.where! as IDataObject).id };
findQuery.where = { id: findQuery.where.id };
}
}

View File

@ -1,6 +1,6 @@
{
"name": "n8n-core",
"version": "0.92.0",
"version": "0.93.0",
"description": "Core functionality of n8n",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@ -50,7 +50,7 @@
"form-data": "^4.0.0",
"lodash.get": "^4.4.2",
"mime-types": "^2.1.27",
"n8n-workflow": "~0.75.0",
"n8n-workflow": "~0.76.0",
"oauth-1.0a": "^2.2.6",
"p-cancelable": "^2.0.0",
"qs": "^6.10.1",

View File

@ -87,6 +87,8 @@ import {
axios.defaults.timeout = 300000;
// Prevent axios from adding x-form-www-urlencoded headers by default
axios.defaults.headers.post = {};
axios.defaults.headers.put = {};
axios.defaults.headers.patch = {};
axios.defaults.paramsSerializer = (params) => {
if (params instanceof URLSearchParams) {
return params.toString();
@ -135,6 +137,28 @@ function searchForHeader(headers: IDataObject, headerName: string) {
return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
}
async function generateContentLengthHeader(formData: FormData, headers: IDataObject) {
if (!formData || !formData.getLength) {
return;
}
try {
const length = await new Promise((res, rej) => {
formData.getLength((error: Error | null, length: number) => {
if (error) {
rej(error);
return;
}
res(length);
});
});
headers = Object.assign(headers, {
'content-length': length,
});
} catch (error) {
Logger.error('Unable to calculate form data length', { error });
}
}
async function parseRequestObject(requestObject: IDataObject) {
// This function is a temporary implementation
// That translates all http requests done via
@ -199,6 +223,7 @@ async function parseRequestObject(requestObject: IDataObject) {
delete axiosConfig.headers[contentTypeHeaderKeyName];
const headers = axiosConfig.data.getHeaders();
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
} else {
// When using the `form` property it means the content should be x-www-form-urlencoded.
if (requestObject.form !== undefined && requestObject.body === undefined) {
@ -235,6 +260,7 @@ async function parseRequestObject(requestObject: IDataObject) {
// Mix in headers as FormData creates the boundary.
const headers = axiosConfig.data.getHeaders();
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
} else if (requestObject.body !== undefined) {
// If we have body and possibly form
if (requestObject.form !== undefined) {

View File

@ -1,6 +1,6 @@
{
"name": "n8n-editor-ui",
"version": "0.115.0",
"version": "0.116.0",
"description": "Workflow Editor UI for n8n",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@ -72,7 +72,7 @@
"lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2",
"lodash.set": "^4.3.2",
"n8n-workflow": "~0.75.0",
"n8n-workflow": "~0.76.0",
"sass": "^1.26.5",
"normalize-wheel": "^1.0.1",
"prismjs": "^1.17.1",

View File

@ -1686,7 +1686,9 @@ export default mixins(
await this.$store.dispatch('workflows/setNewWorkflowName');
this.$store.commit('setStateDirty', false);
await this.addNodes([DEFAULT_START_NODE]);
const nodes = [{...DEFAULT_START_NODE}];
await this.addNodes(nodes);
this.$store.commit('setStateDirty', false);
this.setZoomLevel(1);

View File

@ -1,6 +1,6 @@
{
"name": "n8n-node-dev",
"version": "0.32.0",
"version": "0.33.0",
"description": "CLI to simplify n8n credentials/node development",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@ -60,8 +60,8 @@
"change-case": "^4.1.1",
"copyfiles": "^2.1.1",
"inquirer": "^7.0.1",
"n8n-core": "~0.92.0",
"n8n-workflow": "~0.75.0",
"n8n-core": "~0.93.0",
"n8n-workflow": "~0.76.0",
"oauth-1.0a": "^2.2.6",
"replace-in-file": "^6.0.0",
"request": "^2.88.2",

View File

@ -0,0 +1,19 @@
import {
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
export class OneSimpleApi implements ICredentialType {
name = 'oneSimpleApi';
displayName = 'One Simple API';
documentationUrl = 'oneSimpleApi';
properties: INodeProperties[] = [
{
displayName: 'API Token',
name: 'apiToken',
type: 'string',
default: '',
},
];
}

View File

@ -0,0 +1,20 @@
{
"node": "n8n-nodes-base.dropcontact",
"nodeVersion": "1.0",
"codexVersion": "1.0",
"categories": [
"Sales"
],
"resources": {
"credentialDocumentation": [
{
"url": "https://docs.n8n.io/credentials/dropcontact"
}
],
"primaryDocumentation": [
{
"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dropcontact/"
}
]
}
}

View File

@ -152,6 +152,10 @@ const nodeOperationOptions: INodeProperties[] = [
},
},
options: [
{
name: 'Circle',
value: 'circle',
},
{
name: 'Line',
value: 'line',
@ -192,6 +196,7 @@ const nodeOperationOptions: INodeProperties[] = [
'draw',
],
primitive: [
'circle',
'line',
'rectangle',
],
@ -210,6 +215,7 @@ const nodeOperationOptions: INodeProperties[] = [
'draw',
],
primitive: [
'circle',
'line',
'rectangle',
],
@ -228,6 +234,7 @@ const nodeOperationOptions: INodeProperties[] = [
'draw',
],
primitive: [
'circle',
'line',
'rectangle',
],
@ -246,6 +253,7 @@ const nodeOperationOptions: INodeProperties[] = [
'draw',
],
primitive: [
'circle',
'line',
'rectangle',
],
@ -472,6 +480,110 @@ const nodeOperationOptions: INodeProperties[] = [
},
description: 'The name of the binary property which contains the data of the image to composite on top of image which is found in Property Name.',
},
{
displayName: 'Operator',
name: 'operator',
type: 'options',
displayOptions: {
show: {
operation: [
'composite',
],
},
},
options: [
{
name: 'Add',
value: 'Add',
},
{
name: 'Atop',
value: 'Atop',
},
{
name: 'Bumpmap',
value: 'Bumpmap',
},
{
name: 'Copy',
value: 'Copy',
},
{
name: 'Copy Black',
value: 'CopyBlack',
},
{
name: 'Copy Blue',
value: 'CopyBlue',
},
{
name: 'Copy Cyan',
value: 'CopyCyan',
},
{
name: 'Copy Green',
value: 'CopyGreen',
},
{
name: 'Copy Magenta',
value: 'CopyMagenta',
},
{
name: 'Copy Opacity',
value: 'CopyOpacity',
},
{
name: 'Copy Red',
value: 'CopyRed',
},
{
name: 'Copy Yellow',
value: 'CopyYellow',
},
{
name: 'Difference',
value: 'Difference',
},
{
name: 'Divide',
value: 'Divide',
},
{
name: 'In',
value: 'In',
},
{
name: 'Minus',
value: 'Minus',
},
{
name: 'Multiply',
value: 'Multiply',
},
{
name: 'Out',
value: 'Out',
},
{
name: 'Over',
value: 'Over',
},
{
name: 'Plus',
value: 'Plus',
},
{
name: 'Subtract',
value: 'Subtract',
},
{
name: 'Xor',
value: 'Xor',
},
],
default: 'Over',
description: 'The operator to use to combine the images.',
},
{
displayName: 'Position X',
name: 'positionX',
@ -1095,6 +1207,7 @@ export class EditImage implements INodeType {
} else if (operationData.operation === 'composite') {
const positionX = operationData.positionX as number;
const positionY = operationData.positionY as number;
const operator = operationData.operator as string;
const geometryString = (positionX >= 0 ? '+' : '') + positionX + (positionY >= 0 ? '+' : '') + positionY;
@ -1109,9 +1222,9 @@ export class EditImage implements INodeType {
if (operations[0].operation === 'create') {
// It seems like if the image gets created newly we have to create a new gm instance
// else it fails for some reason
gmInstance = gm(gmInstance!.stream('png')).geometry(geometryString).composite(path);
gmInstance = gm(gmInstance!.stream('png')).compose(operator).geometry(geometryString).composite(path);
} else {
gmInstance = gmInstance!.geometry(geometryString).composite(path);
gmInstance = gmInstance!.compose(operator).geometry(geometryString).composite(path);
}
if (operations.length !== i + 1) {
@ -1131,6 +1244,8 @@ export class EditImage implements INodeType {
if (operationData.primitive === 'line') {
gmInstance = gmInstance.drawLine(operationData.startPositionX as number, operationData.startPositionY as number, operationData.endPositionX as number, operationData.endPositionY as number);
} else if (operationData.primitive === 'circle') {
gmInstance = gmInstance.drawCircle(operationData.startPositionX as number, operationData.startPositionY as number, operationData.endPositionX as number, operationData.endPositionY as number);
} else if (operationData.primitive === 'rectangle') {
gmInstance = gmInstance.drawRectangle(operationData.startPositionX as number, operationData.startPositionY as number, operationData.endPositionX as number, operationData.endPositionY as number, operationData.cornerRadius as number || undefined);
}

View File

@ -124,7 +124,7 @@ export class GoogleTasks implements INodeType {
body.notes = additionalFields.notes as string;
}
if (additionalFields.dueDate) {
body.dueDate = additionalFields.dueDate as string;
body.due = additionalFields.dueDate as string;
}
if (additionalFields.completed) {
@ -249,7 +249,7 @@ export class GoogleTasks implements INodeType {
}
if (updateFields.dueDate) {
body.dueDate = updateFields.dueDate as string;
body.due = updateFields.dueDate as string;
}
if (updateFields.completed) {

View File

@ -447,6 +447,13 @@ export const taskFields = [
default: false,
description: 'Flag indicating whether the task has been deleted.',
},
{
displayName: 'Due Date',
name: 'dueDate',
type: 'dateTime',
default: '',
description: 'Due date of the task.',
},
{
displayName: 'Notes',
name: 'notes',

View File

@ -179,7 +179,7 @@ export class Jira implements INodeType {
} catch (err) {
return {
status: 'Error',
message: `Connection details not valid; ${err.message}`,
message: `Connection details not valid: ${err.message}`,
};
}
return {

View File

@ -0,0 +1,41 @@
import {
OptionsWithUri
} from 'request';
import {
IExecuteFunctions,
} from 'n8n-core';
import {
IDataObject,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
export async function oneSimpleApiRequest(this: IExecuteFunctions, method: string, resource: string, body: IDataObject = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}) {
const credentials = await this.getCredentials('oneSimpleApi');
if (credentials === undefined) {
throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
}
const outputFormat = 'json';
let options: OptionsWithUri = {
method,
body,
qs,
uri: uri || `https://onesimpleapi.com/api${resource}?token=${credentials.apiToken}&output=${outputFormat}`,
json: true,
};
options = Object.assign({}, options, option);
if (Object.keys(body).length === 0) {
delete options.body;
}
try {
const responseData = await this.helpers.request(options);
return responseData;
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}
}

View File

@ -0,0 +1,20 @@
{
"node": "n8n-nodes-base.oneSimpleApi",
"nodeVersion": "1.0",
"codexVersion": "1.0",
"categories": [
"Utility"
],
"resources": {
"credentialDocumentation": [
{
"url": "https://docs.n8n.io/credentials/OneSimpleAPI"
}
],
"primaryDocumentation": [
{
"url": "https://docs.n8n.io/nodes/n8n-nodes-base.oneSimpleApi/"
}
]
}
}

View File

@ -0,0 +1,867 @@
import {
IExecuteFunctions,
} from 'n8n-core';
import {
IDataObject,
INodeExecutionData,
INodeType,
INodeTypeDescription,
} from 'n8n-workflow';
import {
oneSimpleApiRequest,
} from './GenericFunctions';
export class OneSimpleApi implements INodeType {
description: INodeTypeDescription = {
displayName: 'One Simple API',
name: 'oneSimpleApi',
icon: 'file:onesimpleapi.svg',
group: ['transform'],
version: 1,
description: 'A toolbox of no-code utilities',
defaults: {
name: 'One Simple API',
color: '#1A82e2',
},
inputs: ['main'],
outputs: ['main'],
credentials: [
{
name: 'oneSimpleApi',
required: true,
},
],
properties: [
{
displayName: 'Resource',
name: 'resource',
type: 'options',
options: [
{
name: 'Information',
value: 'information',
},
{
name: 'Utility',
value: 'utility',
},
{
name: 'Website',
value: 'website',
},
],
default: 'website',
required: true,
},
// Generation
{
displayName: 'Operation',
name: 'operation',
type: 'options',
displayOptions: {
show: {
resource: [
'website',
],
},
},
options: [
{
name: 'Generate PDF',
value: 'pdf',
description: 'Generate a PDF from a webpage',
},
{
name: 'Get SEO Data',
value: 'seo',
description: 'Get SEO information from website',
},
{
name: 'Take Screenshot',
value: 'screenshot',
description: 'Create a screenshot from a webpage',
},
],
default: 'pdf',
},
// Information
{
displayName: 'Operation',
name: 'operation',
type: 'options',
displayOptions: {
show: {
resource: [
'information',
],
},
},
options: [
{
name: 'Exchange Rate',
value: 'exchangeRate',
description: 'Convert a value between currencies',
},
{
name: 'Image Metadata',
value: 'imageMetadata',
description: 'Retrieve image metadata from a URL',
},
],
default: 'exchangeRate',
description: 'The operation to perform.',
},
// Utiliy
{
displayName: 'Operation',
name: 'operation',
type: 'options',
displayOptions: {
show: {
resource: [
'utility',
],
},
},
options: [
{
name: 'Expand URL',
value: 'expandURL',
description: 'Expand a shortened url',
},
{
name: 'Generate QR Code',
value: 'qrCode',
description: 'Generate a QR Code',
},
{
name: 'Validate Email',
value: 'validateEmail',
description: 'Validate an email address',
},
],
default: 'validateEmail',
description: 'The operation to perform.',
},
// website: pdf
{
displayName: 'Webpage URL',
name: 'link',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'pdf',
],
resource: [
'website',
],
},
},
default: '',
description: 'Link to webpage to convert',
},
{
displayName: 'Download PDF?',
name: 'download',
type: 'boolean',
required: true,
displayOptions: {
show: {
operation: [
'pdf',
],
resource: [
'website',
],
},
},
default: false,
description: 'Whether to download the PDF or return a link to it',
},
{
displayName: 'Put Output In Field',
name: 'output',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'pdf',
],
resource: [
'website',
],
download: [
true,
],
},
},
default: 'data',
description: 'The name of the output field to put the binary file data in',
},
{
displayName: 'Options',
name: 'options',
type: 'collection',
placeholder: 'Add Option',
default: {},
displayOptions: {
show: {
resource: [
'website',
],
operation: [
'pdf',
],
},
},
options: [
{
displayName: 'Page Size',
name: 'page',
type: 'options',
options: [
{
name: 'A0',
value: 'A0',
},
{
name: 'A1',
value: 'A1',
},
{
name: 'A2',
value: 'A2',
},
{
name: 'A3',
value: 'A3',
},
{
name: 'A4',
value: 'A4',
},
{
name: 'A5',
value: 'A5',
},
{
name: 'A6',
value: 'A6',
},
{
name: 'Legal',
value: 'Legal',
},
{
name: 'Ledger',
value: 'Ledger',
},
{
name: 'Letter',
value: 'Letter',
},
{
name: 'Tabloid',
value: 'Tabloid',
},
],
default: '',
description: 'The page size',
},
{
displayName: 'Force Refresh',
name: 'force',
type: 'boolean',
default: false,
description: `Normally the API will reuse a previously taken screenshot of the URL to give a faster response.
This option allows you to retake the screenshot at that exact time, for those times when it's necessary`,
},
],
},
// website: qrCode
{
displayName: 'QR Content',
name: 'message',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'qrCode',
],
resource: [
'utility',
],
},
},
default: '',
description: 'The text that should be turned into a QR code - like a website URL',
},
{
displayName: 'Download Image?',
name: 'download',
type: 'boolean',
required: true,
displayOptions: {
show: {
operation: [
'qrCode',
],
resource: [
'utility',
],
},
},
default: false,
description: 'Whether to download the QR code or return a link to it',
},
{
displayName: 'Put Output In Field',
name: 'output',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'qrCode',
],
resource: [
'utility',
],
download: [
true,
],
},
},
default: 'data',
description: 'The name of the output field to put the binary file data in',
},
{
displayName: 'Options',
name: 'options',
type: 'collection',
placeholder: 'Add Option',
default: {},
displayOptions: {
show: {
resource: [
'utility',
],
operation: [
'qrCode',
],
},
},
options: [
{
displayName: 'Size',
name: 'size',
type: 'options',
options: [
{
name: 'Small',
value: 'Small',
},
{
name: 'Medium',
value: 'Medium',
},
{
name: 'Large',
value: 'Large',
},
],
default: 'Small',
description: 'The QR Code size',
},
{
displayName: 'Format',
name: 'format',
type: 'options',
options: [
{
name: 'PNG',
value: 'PNG',
},
{
name: 'SVG',
value: 'SVG',
},
],
default: 'PNG',
description: 'The QR Code format',
},
],
},
// website: screenshot
{
displayName: 'Webpage URL',
name: 'link',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'screenshot',
],
resource: [
'website',
],
},
},
default: '',
description: 'Link to webpage to convert',
},
{
displayName: 'Download Screenshot?',
name: 'download',
type: 'boolean',
required: true,
displayOptions: {
show: {
operation: [
'screenshot',
],
resource: [
'website',
],
},
},
default: false,
description: 'Whether to download the screenshot or return a link to it',
},
{
displayName: 'Put Output In Field',
name: 'output',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'screenshot',
],
resource: [
'website',
],
download: [
true,
],
},
},
default: 'data',
description: 'The name of the output field to put the binary file data in',
},
{
displayName: 'Options',
name: 'options',
type: 'collection',
placeholder: 'Add Option',
default: {},
displayOptions: {
show: {
resource: [
'website',
],
operation: [
'screenshot',
],
},
},
options: [
{
displayName: 'Screen Size',
name: 'screen',
type: 'options',
options: [
{
name: 'Phone',
value: 'phone',
},
{
name: 'Phone Landscape',
value: 'phone-landscape',
},
{
name: 'Retina',
value: 'retina',
},
{
name: 'Tablet',
value: 'tablet',
},
{
name: 'Tablet Landscape',
value: 'tablet-landscape',
},
],
default: '',
description: 'The screen size',
},
{
displayName: 'Force Refresh',
name: 'force',
type: 'boolean',
default: false,
description: `Normally the API will reuse a previously taken screenshot of the URL to give a faster response.
This option allows you to retake the screenshot at that exact time, for those times when it's necessary`,
},
{
displayName: 'Full Page',
name: 'fullpage',
type: 'boolean',
default: false,
description: 'The API takes a screenshot of the viewable area for the desired screen size. If you need a screenshot of the whole length of the page, use this option',
},
],
},
// information: exchangeRate
{
displayName: 'Value',
name: 'value',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'exchangeRate',
],
resource: [
'information',
],
},
},
default: '',
description: 'Value to convert',
},
{
displayName: 'From Currency',
name: 'fromCurrency',
type: 'string',
required: true,
placeholder: 'USD',
displayOptions: {
show: {
operation: [
'exchangeRate',
],
resource: [
'information',
],
},
},
default: '',
description: 'From Currency',
},
{
displayName: 'To Currency',
name: 'toCurrency',
type: 'string',
placeholder: 'EUR',
required: true,
displayOptions: {
show: {
operation: [
'exchangeRate',
],
resource: [
'information',
],
},
},
default: '',
description: 'To Currency',
},
// information: imageMetadata
{
displayName: 'Link To Image',
name: 'link',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'imageMetadata',
],
resource: [
'information',
],
},
},
default: '',
description: 'Image to get metadata from',
},
// website: seo
{
displayName: 'Webpage URL',
name: 'link',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'seo',
],
resource: [
'website',
],
},
},
default: '',
description: 'Webpage to get SEO information for',
},
{
displayName: 'Options',
name: 'options',
type: 'collection',
placeholder: 'Add Option',
default: {},
displayOptions: {
show: {
resource: [
'website',
],
operation: [
'seo',
],
},
},
options: [
{
displayName: 'Include Headers?',
name: 'headers',
type: 'boolean',
default: false,
description: '',
},
],
},
// utility: validateEmail
{
displayName: 'Email Address',
name: 'emailAddress',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'validateEmail',
],
resource: [
'utility',
],
},
},
default: '',
description: 'Email Address',
},
// utility: expandURL
{
displayName: 'URL',
name: 'link',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
'expandURL',
],
resource: [
'utility',
],
},
},
default: '',
description: 'URL to unshorten',
},
],
};
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData();
const returnData: IDataObject[] = [];
const length = items.length as unknown as number;
const qs: IDataObject = {};
let responseData;
let download;
for (let i = 0; i < length; i++) {
try {
const resource = this.getNodeParameter('resource', 0) as string;
const operation = this.getNodeParameter('operation', 0) as string;
if (resource === 'website') {
if (operation === 'pdf') {
const link = this.getNodeParameter('link', i) as string;
const options = this.getNodeParameter('options', i) as IDataObject;
download = this.getNodeParameter('download', i) as boolean;
qs.url = link;
if (options.page) {
qs.page = options.page as string;
}
if (options.force) {
qs.force = 'yes';
} else {
qs.force = 'no';
}
const response = await oneSimpleApiRequest.call(this, 'GET', '/pdf', {}, qs);
if (download) {
const output = this.getNodeParameter('output', i) as string;
const buffer = await oneSimpleApiRequest.call(this, 'GET', '', {}, {}, response.url, { json: false, encoding: null }) as Buffer;
responseData = {
json: response,
binary: {
[output]: await this.helpers.prepareBinaryData(buffer),
},
};
} else {
responseData = response;
}
}
if (operation === 'screenshot') {
const link = this.getNodeParameter('link', i) as string;
const options = this.getNodeParameter('options', i) as IDataObject;
download = this.getNodeParameter('download', i) as boolean;
qs.url = link;
if (options.screen) {
qs.screen = options.screen as string;
}
if (options.fullpage) {
qs.fullpage = 'yes';
} else {
qs.fullpage = 'no';
}
if (options.force) {
qs.force = 'yes';
} else {
qs.force = 'no';
}
const response = await oneSimpleApiRequest.call(this, 'GET', '/screenshot', {}, qs);
if (download) {
const output = this.getNodeParameter('output', i) as string;
const buffer = await oneSimpleApiRequest.call(this, 'GET', '', {}, {}, response.url, { json: false, encoding: null }) as Buffer;
responseData = {
json: response,
binary: {
[output]: await this.helpers.prepareBinaryData(buffer),
},
};
} else {
responseData = response;
}
}
if (operation === 'seo') {
const link = this.getNodeParameter('link', i) as string;
const options = this.getNodeParameter('options', i) as IDataObject;
qs.url = link;
if (options.headers) {
qs.headers = 'yes';
}
responseData = await oneSimpleApiRequest.call(this, 'GET', '/page_info', {}, qs);
}
}
if (resource === 'information') {
if (operation === 'exchangeRate') {
const value = this.getNodeParameter('value', i) as string;
const fromCurrency = this.getNodeParameter('fromCurrency', i) as string;
const toCurrency = this.getNodeParameter('toCurrency', i) as string;
qs.from_currency = fromCurrency;
qs.to_currency = toCurrency;
qs.from_value = value;
responseData = await oneSimpleApiRequest.call(this, 'GET', '/exchange_rate', {}, qs);
}
if (operation === 'imageMetadata') {
const link = this.getNodeParameter('link', i) as string;
qs.url = link;
qs.raw = true;
responseData = await oneSimpleApiRequest.call(this, 'GET', '/image_info', {}, qs);
}
}
if (resource === 'utility') {
// validateEmail
if (operation === 'validateEmail') {
const emailAddress = this.getNodeParameter('emailAddress', i) as string;
qs.email = emailAddress;
responseData = await oneSimpleApiRequest.call(this, 'GET', '/email', {}, qs);
}
// expandURL
if (operation === 'expandURL') {
const url = this.getNodeParameter('link', i) as string;
qs.url = url;
responseData = await oneSimpleApiRequest.call(this, 'GET', '/unshorten', {}, qs);
}
if (operation === 'qrCode') {
const message = this.getNodeParameter('message', i) as string;
const options = this.getNodeParameter('options', i) as IDataObject;
download = this.getNodeParameter('download', i) as boolean;
qs.message = message;
if (options.size) {
qs.size = options.size as string;
}
if (options.format) {
qs.format = options.format as string;
}
const response = await oneSimpleApiRequest.call(this, 'GET', '/qr_code', {}, qs);
if (download) {
const output = this.getNodeParameter('output', i) as string;
const buffer = await oneSimpleApiRequest.call(this, 'GET', '', {}, {}, response.url, { json: false, encoding: null }) as Buffer;
responseData = {
json: response,
binary: {
[output]: await this.helpers.prepareBinaryData(buffer),
},
};
} else {
responseData = response;
}
}
}
if (Array.isArray(responseData)) {
returnData.push.apply(returnData, responseData as IDataObject[]);
} else {
returnData.push(responseData as IDataObject);
}
} catch (error) {
if (this.continueOnFail()) {
returnData.push({ error: error.message });
continue;
}
throw error;
}
}
if (download) {
return this.prepareOutputData(returnData as unknown as INodeExecutionData[]);
}
return [this.helpers.returnJsonArray(returnData)];
}
}

View File

@ -0,0 +1,25 @@
<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 512.000000 512.000000" preserveAspectRatio="xMidYMid meet" class="block h-9 w-auto"><g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" fill="#2563eb" stroke="none"><path d="M381 5100 c-91 -24 -149 -57 -221 -126 -72 -69 -115 -142 -140 -238
-19 -77 -20 -109 -20 -1052 l0 -973 37 5 c128 17 191 43 259 106 57 53 90 112
115 205 19 69 22 123 29 468 9 422 13 455 70 603 98 254 304 439 609 543 86
30 84 32 121 -88 18 -60 35 -113 37 -119 2 -7 -35 -31 -84 -54 -165 -80 -274
-220 -323 -415 -28 -110 -39 -273 -40 -585 -1 -287 -10 -367 -53 -482 -47
-123 -136 -235 -247 -308 -23 -15 -41 -31 -41 -34 0 -4 28 -25 62 -48 113 -75
203 -209 250 -368 20 -69 22 -108 30 -465 7 -332 11 -404 28 -485 44 -207 158
-367 319 -448 44 -22 85 -41 92 -44 10 -3 4 -32 -25 -118 -21 -63 -41 -119
-45 -123 -8 -9 -164 45 -245 85 -97 49 -158 92 -234 164 -87 82 -128 136 -179
239 -84 168 -102 280 -102 640 -1 309 -10 443 -39 535 -50 161 -167 256 -340
276 l-61 7 0 -970 c0 -940 1 -972 20 -1049 25 -96 68 -169 140 -238 73 -70
131 -102 225 -126 77 -20 111 -20 2175 -20 2070 0 2098 0 2176 20 96 25 169
68 238 140 70 73 102 131 126 225 19 76 20 111 20 1048 l0 969 -56 -7 c-186
-23 -302 -128 -350 -317 -12 -49 -18 -150 -24 -453 -5 -214 -13 -412 -19 -440
-77 -353 -286 -577 -664 -710 -43 -15 -79 -26 -81 -24 -11 13 -77 232 -73 242
3 7 23 19 44 25 107 32 247 162 307 284 72 146 78 188 86 618 9 447 17 504 92
657 40 83 146 192 237 245 l63 37 -49 25 c-107 54 -200 150 -258 265 -68 134
-85 271 -85 681 0 291 -9 377 -50 500 -30 89 -100 198 -165 259 -52 47 -181
121 -211 121 -20 0 -18 12 23 138 l38 113 34 -6 c19 -4 68 -20 110 -36 277
-110 459 -282 551 -521 57 -149 61 -181 70 -608 6 -308 11 -409 24 -458 48
-189 156 -284 354 -311 l52 -8 0 972 c0 939 -1 974 -20 1050 -24 94 -56 152
-126 225 -69 72 -142 115 -238 140 -78 20 -105 20 -2180 19 -2045 0 -2103 -1
-2175 -19z m2519 -2295 l0 -1575 -200 0 -200 0 0 1325 c0 729 -2 1325 -5 1325
-3 0 -141 -50 -307 -111 -167 -61 -345 -126 -396 -145 l-92 -33 2 181 3 181
560 213 c334 126 575 212 598 213 l37 1 0 -1575z"></path></g></svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@ -0,0 +1,19 @@
{
"node": "n8n-nodes-base.respondToWebhook",
"nodeVersion": "1.0",
"codexVersion": "1.0",
"categories": [
"Core Nodes",
"Utility"
],
"resources": {
"primaryDocumentation": [
{
"url": "https://docs.n8n.io/nodes/n8n-nodes-base.respondToWebhook/"
}
]
},
"subcategories": {
"Core Nodes":["Flow"]
}
}

View File

@ -820,7 +820,7 @@ export class StripeTrigger implements INodeType {
try {
await stripeApiRequest.call(this, 'GET', endpoint, {});
} catch (error) {
if (error.message.includes('resource_missing')) {
if (error.httpCode === '404' || error.message.includes('resource_missing')) {
// Webhook does not exist
delete webhookData.webhookId;
delete webhookData.webhookEvents;

View File

@ -25,7 +25,7 @@ export async function togglApiRequest(this: ITriggerFunctions | IPollFunctions |
headers: headerWithAuthentication,
method,
qs: query,
uri: uri || `https://www.toggl.com/api/v8${resource}`,
uri: uri || `https://api.track.toggl.com/api/v8${resource}`,
body,
json: true,
};

View File

@ -1,8 +1,14 @@
import {
OptionsWithUri,
} from 'request';
import {
IExecuteFunctions,
} from 'n8n-core';
import {
ICredentialsDecrypted,
ICredentialTestFunctions,
IDataObject,
ILoadOptionsFunctions,
INodeExecutionData,
@ -10,6 +16,7 @@ import {
INodeType,
INodeTypeDescription,
NodeApiError,
NodeCredentialTestResult,
NodeOperationError,
} from 'n8n-workflow';
@ -70,6 +77,7 @@ export class Zendesk implements INodeType {
],
},
},
testedBy: 'zendeskSoftwareApiTest',
},
{
name: 'zendeskOAuth2Api',
@ -146,6 +154,42 @@ export class Zendesk implements INodeType {
};
methods = {
credentialTest: {
async zendeskSoftwareApiTest(this: ICredentialTestFunctions, credential: ICredentialsDecrypted): Promise<NodeCredentialTestResult> {
const credentials = credential.data;
const subdomain = credentials!.subdomain;
const email = credentials!.email;
const apiToken = credentials!.apiToken;
const base64Key = Buffer.from(`${email}/token:${apiToken}`).toString('base64');
const options: OptionsWithUri = {
headers: {
'Content-Type': 'application/json',
'Authorization': `Basic ${base64Key}`,
},
method: 'GET',
uri: `https://${subdomain}.zendesk.com/api/v2/ticket_fields.json`,
qs: {
recent: 0,
},
json: true,
timeout: 5000,
};
try {
await this.helpers.request!(options);
} catch (error) {
return {
status: 'Error',
message: `Connection details not valid: ${error.message}`,
};
}
return {
status: 'OK',
message: 'Authentication successful!',
};
},
},
loadOptions: {
// Get all the custom fields to display them to user so that he can
// select them easily

View File

@ -226,14 +226,14 @@ export const userFields = [
name: 'isAdmin',
type: 'boolean',
default: false,
description: 'Whether the target user is an administrator.',
description: 'Whether the target user is an administrator',
},
{
displayName: 'Is Guest',
name: 'isGuest',
type: 'boolean',
default: false,
description: 'Whether the target user is a guest.',
description: 'Whether the target user is a guest',
},
{
displayName: 'Profile Data',
@ -268,6 +268,35 @@ export const userFields = [
},
],
},
{
displayName: 'Role',
name: 'role',
type: 'options',
options: [
{
name: 'Organization Owner',
value: 100,
},
{
name: 'Organization Administrator',
value: 200,
},
{
name: 'Organization Moderator',
value: 300,
},
{
name: 'Member',
value: 400,
},
{
name: 'Guest',
value: 600,
},
],
default: '',
description: 'Role for the user',
},
],
},

View File

@ -8,4 +8,5 @@ export interface IUser {
email?: string;
password?: string;
short_name?: string;
role?: number;
}

View File

@ -431,6 +431,9 @@ export class Zulip implements INodeType {
if (additionalFields.isGuest) {
body.is_guest = additionalFields.isGuest as boolean;
}
if (additionalFields.role) {
body.role = additionalFields.role as number;
}
if (additionalFields.profileData) {
//@ts-ignore
body.profile_data = additionalFields.profileData.properties as [{}];

View File

@ -1,6 +1,6 @@
{
"name": "n8n-nodes-base",
"version": "0.145.0",
"version": "0.146.0",
"description": "Base nodes of n8n",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@ -201,6 +201,7 @@
"dist/credentials/NotionOAuth2Api.credentials.js",
"dist/credentials/OAuth1Api.credentials.js",
"dist/credentials/OAuth2Api.credentials.js",
"dist/credentials/OneSimpleApi.credentials.js",
"dist/credentials/OpenWeatherMapApi.credentials.js",
"dist/credentials/OrbitApi.credentials.js",
"dist/credentials/OuraApi.credentials.js",
@ -520,6 +521,7 @@
"dist/nodes/Notion/NotionTrigger.node.js",
"dist/nodes/N8nTrainingCustomerDatastore.node.js",
"dist/nodes/N8nTrainingCustomerMessenger.node.js",
"dist/nodes/OneSimpleApi/OneSimpleApi.node.js",
"dist/nodes/OpenThesaurus/OpenThesaurus.node.js",
"dist/nodes/OpenWeatherMap.node.js",
"dist/nodes/Orbit/Orbit.node.js",
@ -671,7 +673,7 @@
"@types/xml2js": "^0.4.3",
"gulp": "^4.0.0",
"jest": "^26.4.2",
"n8n-workflow": "~0.75.0",
"n8n-workflow": "~0.76.0",
"nodelinter": "^0.1.9",
"ts-jest": "^26.3.0",
"tslint": "^6.1.2",
@ -711,7 +713,7 @@
"mqtt": "4.2.6",
"mssql": "^6.2.0",
"mysql2": "~2.3.0",
"n8n-core": "~0.92.0",
"n8n-core": "~0.93.0",
"node-ssh": "^12.0.0",
"nodemailer": "^6.5.0",
"pdf-parse": "^1.1.1",

View File

@ -1,6 +1,6 @@
{
"name": "n8n-workflow",
"version": "0.75.0",
"version": "0.76.0",
"description": "Workflow base code of n8n",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",

View File

@ -99,6 +99,22 @@ export class Expression {
);
const data = dataProxy.getDataProxy();
// Support only a subset of process properties
// @ts-ignore
data.process = {
arch: process.arch,
env: process.env,
platform: process.platform,
pid: process.pid,
ppid: process.ppid,
release: process.release,
version: process.pid,
versions: process.versions,
};
// @ts-ignore
data.document = {};
// Execute the expression
try {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call