✨ SIGNL4-Node

packages/nodes-base/nodes/SIGNL4/GenericFunctions.ts

@@ -1,62 +1,52 @@
 import {
 	IExecuteFunctions,
-	IHookFunctions,
 } from 'n8n-core';
 
 import {
-	ICredentialDataDecryptedObject,
 	IDataObject,
 } from 'n8n-workflow';
 
+import {
+	OptionsWithUri,
+ } from 'request';
+
 /**
- * Make an API request to MSG91
+ * Make an API request to SIGNL4
  *
  * @param {IHookFunctions | IExecuteFunctions} this
  * @param {object} message
  * @returns {Promise<any>}
  */
-export async function SIGNL4ApiRequest(this: IHookFunctions | IExecuteFunctions, message: IDataObject): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('SIGNL4Api');
-	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
-	}
-	
-	const teamsecret = credentials!.teamSecret as string;
 
-	var response = null;
-	try {
-		response = await this.helpers.request({
-			headers: {'Content-Type': 'application/json'},
-			method: 'POST',
-			body: message,
-			qs: {},
-			uri: `https://connect.signl4.com/webhook/${teamsecret}`,
-			json: true
-		});
+export async function SIGNL4ApiRequest(this: IExecuteFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	let options: OptionsWithUri = {
+		headers: {
+			'Accept': '*/*',
+		},
+		method,
+		body,
+		qs: query,
+		uri: uri || ``,
+		json: true,
+	};
+
+	if (!Object.keys(body).length) {
+		delete options.body;
 	}
-	catch (error) {
-		
-		if (error && error.message) {
-			throw new Error(`Error sending the SIGNL4 request. Error: ${JSON.stringify(error.message)}`);
+	if (!Object.keys(query).length) {
+		delete options.qs;
+	}
+	options = Object.assign({}, options, option);
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+
+		if (error.response && error.response.body && error.response.body.details) {
+			throw new Error(`SIGNL4 error response [${error.statusCode}]: ${error.response.body.details}`);
 		}
-			
-		throw new Error('Error sending the SIGNL4 request.');
 
 		throw error;
 	}
-
-	return response;
-}
-
-
-function setPayload(credentials: ICredentialDataDecryptedObject, o?: IDataObject) {
-	if (!o) {
-		o = {};
-	}
-
-	o.p = credentials!.teamSecret as string;
-	o.json = 1;
-	o.sendwith = 'n8n';
-
-	return o;
 }