diff --git a/packages/nodes-base/credentials/Sms77.credentials.ts b/packages/nodes-base/credentials/Sms77Api.credentials.ts similarity index 67% rename from packages/nodes-base/credentials/Sms77.credentials.ts rename to packages/nodes-base/credentials/Sms77Api.credentials.ts index f098297dff..e560a9f124 100644 --- a/packages/nodes-base/credentials/Sms77.credentials.ts +++ b/packages/nodes-base/credentials/Sms77Api.credentials.ts @@ -3,9 +3,9 @@ import { NodePropertyTypes, } from 'n8n-workflow'; -export class Sms77 implements ICredentialType { - name = 'Sms77'; - displayName = 'Sms77'; +export class Sms77Api implements ICredentialType { + name = 'sms77Api'; + displayName = 'Sms77 API'; properties = [ { displayName: 'API Key', diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts index 68e9fb281b..30499b3b29 100644 --- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts @@ -1,5 +1,12 @@ -import {IExecuteFunctions, IHookFunctions,} from 'n8n-core'; -import {IDataObject,} from 'n8n-workflow'; +import { + IExecuteFunctions, + IHookFunctions, +} from 'n8n-core'; + +import { + ICredentialDataDecryptedObject, + IDataObject, +} from 'n8n-workflow'; /** * Make an API request to MSG91 @@ -12,26 +19,17 @@ import {IDataObject,} from 'n8n-workflow'; * @returns {Promise} */ export async function sms77ApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, form: IDataObject, qs?: IDataObject): Promise { // tslint:disable-line:no-any - const setPayload = (o?: IDataObject) => { - if (!o) { - o = {}; - } - - o.p = credentials!.apiKey as string; - o.json = 1; - o.sendwith = 'n8n'; - - return o; - }; - - const credentials = this.getCredentials('Sms77'); + const credentials = this.getCredentials('sms77Api'); if (credentials === undefined) { throw new Error('No credentials got returned!'); } - 'GET' === method ? qs = setPayload(qs) : form = setPayload(form); - - const res = await this.helpers.request({ + if ('GET' === method) { + qs = setPayload(credentials, qs); + } else { + form = setPayload(credentials, form); + } + const response = await this.helpers.request({ form, json: true, method, @@ -39,9 +37,22 @@ export async function sms77ApiRequest(this: IHookFunctions | IExecuteFunctions, uri: `https://gateway.sms77.io/api/${endpoint}`, }); - if ('100' !== res.success) { + if ('100' !== response.success) { throw new Error('Invalid sms77 credentials or API error!'); } - return res; + return response; +} + + +function setPayload(credentials: ICredentialDataDecryptedObject, o?: IDataObject) { + if (!o) { + o = {}; + } + + o.p = credentials!.apiKey as string; + o.json = 1; + o.sendwith = 'n8n'; + + return o; } diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts index c483253d42..ac8a10f4b6 100644 --- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts +++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts @@ -19,7 +19,7 @@ export class Sms77 implements INodeType { outputs: ['main'], credentials: [ { - name: 'Sms77', + name: 'sms77Api', required: true, } ], @@ -131,13 +131,13 @@ export class Sms77 implements INodeType { throw new Error(`The operation "${operation}" is not known!`); } - returnData.push({ - requestId: await sms77ApiRequest.call(this, 'POST', 'sms', {}, { - from: this.getNodeParameter('from', i), - to: this.getNodeParameter('to', i), - text: this.getNodeParameter('message', i), - } as IDataObject) + const responseData = await sms77ApiRequest.call(this, 'POST', 'sms', {}, { + from: this.getNodeParameter('from', i), + to: this.getNodeParameter('to', i), + text: this.getNodeParameter('message', i), }); + + returnData.push(responseData); } return [this.helpers.returnJsonArray(returnData)]; } diff --git a/packages/nodes-base/nodes/Sms77/sms77.png b/packages/nodes-base/nodes/Sms77/sms77.png index 9ee5756efe..500ba005ae 100644 Binary files a/packages/nodes-base/nodes/Sms77/sms77.png and b/packages/nodes-base/nodes/Sms77/sms77.png differ diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index 82e0c02223..93ac08a158 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -92,7 +92,7 @@ "dist/credentials/RundeckApi.credentials.js", "dist/credentials/ShopifyApi.credentials.js", "dist/credentials/SlackApi.credentials.js", - "dist/credentials/Sms77.credentials.js", + "dist/credentials/Sms77Api.credentials.js", "dist/credentials/Smtp.credentials.js", "dist/credentials/StripeApi.credentials.js", "dist/credentials/SalesmateApi.credentials.js", @@ -220,6 +220,7 @@ "dist/nodes/Shopify/Shopify.node.js", "dist/nodes/Shopify/ShopifyTrigger.node.js", "dist/nodes/Slack/Slack.node.js", + "dist/nodes/Sms77/Sms77.node.js", "dist/nodes/SplitInBatches.node.js", "dist/nodes/SpreadsheetFile.node.js", "dist/nodes/SseTrigger.node.js",