mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
🐛 Fixes issue handling error responses in Rocketchat node (#1367)
This commit is contained in:
ricardo
parent
cc4d6ab02a
commit
4ec458d56b
|
|
@ -1,12 +1,14 @@
|
||||||
import { OptionsWithUri } from 'request';
|
import {
|
||||||
|
OptionsWithUri,
|
||||||
|
} from 'request';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
IExecuteFunctions,
|
IExecuteFunctions,
|
||||||
IExecuteSingleFunctions,
|
|
||||||
IHookFunctions,
|
IHookFunctions,
|
||||||
ILoadOptionsFunctions,
|
ILoadOptionsFunctions,
|
||||||
} from 'n8n-core';
|
} from 'n8n-core';
|
||||||
|
|
||||||
export async function rocketchatApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, resource: string, method: string, operation: string, body: any = {}, headers?: object): Promise<any> { // tslint:disable-line:no-any
|
export async function rocketchatApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, resource: string, method: string, operation: string, body: any = {}, headers?: object): Promise<any> { // tslint:disable-line:no-any
|
||||||
const credentials = this.getCredentials('rocketchatApi');
|
const credentials = this.getCredentials('rocketchatApi');
|
||||||
|
|
||||||
if (credentials === undefined) {
|
if (credentials === undefined) {
|
||||||
|
|
@ -29,13 +31,15 @@ export async function rocketchatApiRequest(this: IHookFunctions | IExecuteFuncti
|
||||||
try {
|
try {
|
||||||
return await this.helpers.request!(options);
|
return await this.helpers.request!(options);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
let errorMessage = error.message;
|
if (error.response && error.response.body && error.response.body.error) {
|
||||||
|
|
||||||
if (error.response.body.error) {
|
const errorMessage = error.response.body.error;
|
||||||
errorMessage = error.response.body.error;
|
// Try to return the error prettier
|
||||||
|
throw new Error(
|
||||||
|
`Rocketchat error response [${error.statusCode}]: ${errorMessage}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
throw error;
|
||||||
throw new Error(`Rocket.chat error response [${error.statusCode}]: ${errorMessage}`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,15 @@
|
||||||
import {
|
import {
|
||||||
IExecuteSingleFunctions,
|
IExecuteFunctions,
|
||||||
} from 'n8n-core';
|
} from 'n8n-core';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
IDataObject,
|
IDataObject,
|
||||||
INodeExecutionData,
|
INodeExecutionData,
|
||||||
INodeType,
|
INodeType,
|
||||||
INodeTypeDescription,
|
INodeTypeDescription,
|
||||||
} from 'n8n-workflow';
|
} from 'n8n-workflow';
|
||||||
import {
|
|
||||||
|
import {
|
||||||
rocketchatApiRequest,
|
rocketchatApiRequest,
|
||||||
validateJSON
|
validateJSON
|
||||||
} from './GenericFunctions';
|
} from './GenericFunctions';
|
||||||
|
|
@ -50,7 +52,7 @@ export class Rocketchat implements INodeType {
|
||||||
description: INodeTypeDescription = {
|
description: INodeTypeDescription = {
|
||||||
displayName: 'RocketChat',
|
displayName: 'RocketChat',
|
||||||
name: 'rocketchat',
|
name: 'rocketchat',
|
||||||
icon: 'file:rocketchat.png',
|
icon: 'file:rocketchat.svg',
|
||||||
group: ['output'],
|
group: ['output'],
|
||||||
version: 1,
|
version: 1,
|
||||||
subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
|
subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
|
||||||
|
|
@ -395,106 +397,113 @@ export class Rocketchat implements INodeType {
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
async executeSingle(this: IExecuteSingleFunctions): Promise<INodeExecutionData> {
|
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
|
||||||
const resource = this.getNodeParameter('resource') as string;
|
const items = this.getInputData();
|
||||||
const operation = this.getNodeParameter('operation') as string;
|
const length = (items.length as unknown) as number;
|
||||||
let response;
|
let responseData;
|
||||||
|
const returnData: IDataObject[] = [];
|
||||||
if (resource === 'chat') {
|
const resource = this.getNodeParameter('resource', 0) as string;
|
||||||
//https://rocket.chat/docs/developer-guides/rest-api/chat/postmessage
|
const operation = this.getNodeParameter('operation', 0) as string;
|
||||||
if (operation === 'postMessage') {
|
for (let i = 0; i < length; i++) {
|
||||||
const channel = this.getNodeParameter('channel') as string;
|
if (resource === 'chat') {
|
||||||
const text = this.getNodeParameter('text') as string;
|
//https://rocket.chat/docs/developer-guides/rest-api/chat/postmessage
|
||||||
const options = this.getNodeParameter('options') as IDataObject;
|
if (operation === 'postMessage') {
|
||||||
const jsonActive = this.getNodeParameter('jsonParameters') as boolean;
|
const channel = this.getNodeParameter('channel', i) as string;
|
||||||
|
const text = this.getNodeParameter('text', i) as string;
|
||||||
const body: IPostMessageBody = {
|
const options = this.getNodeParameter('options', i) as IDataObject;
|
||||||
channel,
|
const jsonActive = this.getNodeParameter('jsonParameters', i) as boolean;
|
||||||
text,
|
|
||||||
};
|
const body: IPostMessageBody = {
|
||||||
|
channel,
|
||||||
if (options.alias) {
|
text,
|
||||||
body.alias = options.alias as string;
|
};
|
||||||
}
|
|
||||||
if (options.avatar) {
|
if (options.alias) {
|
||||||
body.avatar = options.avatar as string;
|
body.alias = options.alias as string;
|
||||||
}
|
}
|
||||||
if (options.emoji) {
|
if (options.avatar) {
|
||||||
body.emoji = options.emoji as string;
|
body.avatar = options.avatar as string;
|
||||||
}
|
}
|
||||||
|
if (options.emoji) {
|
||||||
if (!jsonActive) {
|
body.emoji = options.emoji as string;
|
||||||
const optionsAttachments = this.getNodeParameter('attachments') as IDataObject[];
|
}
|
||||||
if (optionsAttachments.length > 0) {
|
|
||||||
const attachments: IAttachment[] = [];
|
if (!jsonActive) {
|
||||||
for (let i = 0; i < optionsAttachments.length; i++) {
|
const optionsAttachments = this.getNodeParameter('attachments', i) as IDataObject[];
|
||||||
const attachment: IAttachment = {};
|
if (optionsAttachments.length > 0) {
|
||||||
for (const option of Object.keys(optionsAttachments[i])) {
|
const attachments: IAttachment[] = [];
|
||||||
if (option === 'color') {
|
for (let i = 0; i < optionsAttachments.length; i++) {
|
||||||
attachment.color = optionsAttachments[i][option] as string;
|
const attachment: IAttachment = {};
|
||||||
} else if (option === 'text') {
|
for (const option of Object.keys(optionsAttachments[i])) {
|
||||||
attachment.text = optionsAttachments[i][option] as string;
|
if (option === 'color') {
|
||||||
} else if (option === 'ts') {
|
attachment.color = optionsAttachments[i][option] as string;
|
||||||
attachment.ts = optionsAttachments[i][option] as string;
|
} else if (option === 'text') {
|
||||||
} else if (option === 'messageLinks') {
|
attachment.text = optionsAttachments[i][option] as string;
|
||||||
attachment.message_link = optionsAttachments[i][option] as string;
|
} else if (option === 'ts') {
|
||||||
} else if (option === 'thumbUrl') {
|
attachment.ts = optionsAttachments[i][option] as string;
|
||||||
attachment.thumb_url = optionsAttachments[i][option] as string;
|
} else if (option === 'messageLinks') {
|
||||||
} else if (option === 'collapsed') {
|
attachment.message_link = optionsAttachments[i][option] as string;
|
||||||
attachment.collapsed = optionsAttachments[i][option] as boolean;
|
} else if (option === 'thumbUrl') {
|
||||||
} else if (option === 'authorName') {
|
attachment.thumb_url = optionsAttachments[i][option] as string;
|
||||||
attachment.author_name = optionsAttachments[i][option] as string;
|
} else if (option === 'collapsed') {
|
||||||
} else if (option === 'authorLink') {
|
attachment.collapsed = optionsAttachments[i][option] as boolean;
|
||||||
attachment.author_link = optionsAttachments[i][option] as string;
|
} else if (option === 'authorName') {
|
||||||
} else if (option === 'authorIcon') {
|
attachment.author_name = optionsAttachments[i][option] as string;
|
||||||
attachment.author_icon = optionsAttachments[i][option] as string;
|
} else if (option === 'authorLink') {
|
||||||
} else if (option === 'title') {
|
attachment.author_link = optionsAttachments[i][option] as string;
|
||||||
attachment.title = optionsAttachments[i][option] as string;
|
} else if (option === 'authorIcon') {
|
||||||
} else if (option === 'titleLink') {
|
attachment.author_icon = optionsAttachments[i][option] as string;
|
||||||
attachment.title_link = optionsAttachments[i][option] as string;
|
} else if (option === 'title') {
|
||||||
} else if (option === 'titleLinkDownload') {
|
attachment.title = optionsAttachments[i][option] as string;
|
||||||
attachment.title_link_download = optionsAttachments[i][option] as boolean;
|
} else if (option === 'titleLink') {
|
||||||
} else if (option === 'imageUrl') {
|
attachment.title_link = optionsAttachments[i][option] as string;
|
||||||
attachment.image_url = optionsAttachments[i][option] as string;
|
} else if (option === 'titleLinkDownload') {
|
||||||
} else if (option === 'audioUrl') {
|
attachment.title_link_download = optionsAttachments[i][option] as boolean;
|
||||||
attachment.audio_url = optionsAttachments[i][option] as string;
|
} else if (option === 'imageUrl') {
|
||||||
} else if (option === 'videoUrl') {
|
attachment.image_url = optionsAttachments[i][option] as string;
|
||||||
attachment.video_url = optionsAttachments[i][option] as string;
|
} else if (option === 'audioUrl') {
|
||||||
} else if (option === 'fields') {
|
attachment.audio_url = optionsAttachments[i][option] as string;
|
||||||
const fieldsValues = (optionsAttachments[i][option] as IDataObject).fieldsValues as IDataObject[];
|
} else if (option === 'videoUrl') {
|
||||||
if (fieldsValues.length > 0) {
|
attachment.video_url = optionsAttachments[i][option] as string;
|
||||||
const fields: IField[] = [];
|
} else if (option === 'fields') {
|
||||||
for (let i = 0; i < fieldsValues.length; i++) {
|
const fieldsValues = (optionsAttachments[i][option] as IDataObject).fieldsValues as IDataObject[];
|
||||||
const field: IField = {};
|
if (fieldsValues.length > 0) {
|
||||||
for (const key of Object.keys(fieldsValues[i])) {
|
const fields: IField[] = [];
|
||||||
if (key === 'short') {
|
for (let i = 0; i < fieldsValues.length; i++) {
|
||||||
field.short = fieldsValues[i][key] as boolean;
|
const field: IField = {};
|
||||||
} else if (key === 'title') {
|
for (const key of Object.keys(fieldsValues[i])) {
|
||||||
field.title = fieldsValues[i][key] as string;
|
if (key === 'short') {
|
||||||
} else if (key === 'value') {
|
field.short = fieldsValues[i][key] as boolean;
|
||||||
field.value = fieldsValues[i][key] as string;
|
} else if (key === 'title') {
|
||||||
|
field.title = fieldsValues[i][key] as string;
|
||||||
|
} else if (key === 'value') {
|
||||||
|
field.value = fieldsValues[i][key] as string;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
fields.push(field);
|
||||||
|
attachment.fields = fields;
|
||||||
}
|
}
|
||||||
fields.push(field);
|
|
||||||
attachment.fields = fields;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
attachments.push(attachment);
|
||||||
}
|
}
|
||||||
attachments.push(attachment);
|
body.attachments = attachments;
|
||||||
}
|
}
|
||||||
body.attachments = attachments;
|
} else {
|
||||||
|
body.attachments = validateJSON(this.getNodeParameter('attachmentsJson', i) as string);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
body.attachments = validateJSON(this.getNodeParameter('attachmentsJson') as string);
|
responseData = await rocketchatApiRequest.call(this, '/chat', 'POST', 'postMessage', body);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
response = await rocketchatApiRequest.call(this, '/chat', 'POST', 'postMessage', body);
|
if (Array.isArray(responseData)) {
|
||||||
|
returnData.push.apply(returnData, responseData as IDataObject[]);
|
||||||
|
} else if (responseData !== undefined) {
|
||||||
|
returnData.push(responseData as IDataObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return [this.helpers.returnJsonArray(returnData)];
|
||||||
json: response,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
1
packages/nodes-base/nodes/Rocketchat/rocketchat.svg
Normal file
1
packages/nodes-base/nodes/Rocketchat/rocketchat.svg
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
<svg width="2500" height="2139" viewBox="0 0 256 219" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M255.95 109.307c0-12.853-3.844-25.173-11.43-36.63-6.81-10.283-16.351-19.385-28.355-27.057-23.18-14.806-53.647-22.963-85.782-22.963-10.734 0-21.315.907-31.577 2.705-6.366-5.96-13.82-11.322-21.707-15.56C34.964-10.62.022 9.322.022 9.322s32.487 26.688 27.204 50.08C12.693 73.821 4.814 91.207 4.814 109.307c0 .056.003.115.003.173 0 .057-.003.113-.003.174 0 18.1 7.876 35.486 22.412 49.902C32.509 182.95.022 209.639.022 209.639s34.942 19.939 77.077-.48c7.886-4.238 15.338-9.603 21.707-15.56 10.264 1.796 20.843 2.702 31.577 2.702 32.137 0 62.601-8.151 85.782-22.958 12.004-7.671 21.545-16.77 28.356-27.058 7.585-11.455 11.43-23.781 11.43-36.628 0-.06-.003-.115-.003-.174l.002-.176z" fill="#C1272D"/><path d="M130.383 40.828c59.505 0 107.746 30.814 107.746 68.824 0 38.007-48.241 68.823-107.746 68.823-13.25 0-25.94-1.532-37.662-4.325-11.915 14.332-38.125 34.26-63.587 27.82 8.282-8.895 20.552-23.926 17.926-48.686-15.262-11.873-24.422-27.07-24.422-43.632-.003-38.013 48.238-68.824 107.745-68.824" fill="#FFF"/><path d="M130.383 126.18c7.906 0 14.314-6.408 14.314-14.314 0-7.905-6.408-14.313-14.314-14.313-7.905 0-14.313 6.408-14.313 14.313 0 7.906 6.408 14.314 14.313 14.314zm49.764 0c7.905 0 14.314-6.408 14.314-14.314 0-7.905-6.409-14.313-14.314-14.313s-14.313 6.408-14.313 14.313c0 7.906 6.408 14.314 14.313 14.314zm-99.53-.003c7.904 0 14.311-6.407 14.311-14.31 0-7.904-6.407-14.312-14.31-14.312-7.905 0-14.312 6.408-14.312 14.311 0 7.904 6.407 14.311 14.311 14.311z" fill="#C1272D"/><path d="M130.383 169.42c-13.25 0-25.94-1.33-37.662-3.75-10.52 10.969-32.188 25.714-54.643 25.172-2.959 4.484-6.175 8.15-8.944 11.126 25.462 6.44 51.672-13.486 63.587-27.82 11.723 2.795 24.414 4.325 37.662 4.325 59.027 0 106.962-30.326 107.726-67.915-.764 32.582-48.699 58.861-107.726 58.861z" fill="#CCC"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in a new issue