From a46b050b1534864aff8a0e7de4714e94223715ba Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Thu, 27 Feb 2020 23:27:21 +0100 Subject: [PATCH] :zap: Minor Zulip-Node fixes --- packages/nodes-base/nodes/Zulip/GenericFunctions.ts | 10 +++++----- packages/nodes-base/nodes/Zulip/MessageInterface.ts | 2 +- packages/nodes-base/nodes/Zulip/Zulip.node.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts index 5fc3c3f9e1..6bac0b6136 100644 --- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts @@ -3,7 +3,6 @@ import { OptionsWithUri } from 'request'; import { IExecuteFunctions, ILoadOptionsFunctions, - BINARY_ENCODING } from 'n8n-core'; import { @@ -20,14 +19,15 @@ export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunction throw new Error('No credentials got returned!'); } - const base64Credentials = `${Buffer.from(`${credentials.email}:${credentials.apiKey}`).toString(BINARY_ENCODING)}`; - const endpoint = `${credentials.url}/api/v1`; let options: OptionsWithUri = { + auth: { + user: credentials.email as string, + password: credentials.apiKey as string, + }, headers: { 'Content-Type': 'application/x-www-form-urlencoded', - Authorization: `Basic ${base64Credentials}`, }, method, form: body, @@ -46,7 +46,7 @@ export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunction return await this.helpers.request!(options); } catch (error) { if (error.response) { - let errorMessage = error.response.body.message || error.response.body.description || error.message; + const errorMessage = error.response.body.message || error.response.body.description || error.message; throw new Error(`Zulip error response [${error.statusCode}]: ${errorMessage}`); } throw error; diff --git a/packages/nodes-base/nodes/Zulip/MessageInterface.ts b/packages/nodes-base/nodes/Zulip/MessageInterface.ts index 694d4a6027..b6a6da93fa 100644 --- a/packages/nodes-base/nodes/Zulip/MessageInterface.ts +++ b/packages/nodes-base/nodes/Zulip/MessageInterface.ts @@ -1,6 +1,6 @@ export interface IMessage { type?: string; - to?: string, + to?: string; topic?: string; content?: string; propagat_mode?: string; diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts index af17e23296..83e5c76023 100644 --- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts +++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts @@ -195,7 +195,7 @@ export class Zulip implements INodeType { contentType: items[i].binary[binaryProperty].mimeType, } } - } + }; responseData = await zulipApiRequest.call(this, 'POST', '/user_uploads', {}, {}, undefined, { formData } ); responseData.uri = `${credentials!.url}${responseData.uri}`; }