From ae853ce602feb18ede10be7d1e97ba4d6fddaf19 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Sat, 2 May 2020 13:09:16 +0200 Subject: [PATCH] :zap: Small changes to Sms77 node --- ...credentials.ts => Sms77Api.credentials.ts} | 6 +-- .../nodes/Sms77/GenericFunctions.ts | 51 +++++++++++------- packages/nodes-base/nodes/Sms77/Sms77.node.ts | 14 ++--- packages/nodes-base/nodes/Sms77/sms77.png | Bin 3738 -> 1188 bytes packages/nodes-base/package.json | 3 +- 5 files changed, 43 insertions(+), 31 deletions(-) rename packages/nodes-base/credentials/{Sms77.credentials.ts => Sms77Api.credentials.ts} (67%) 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 9ee5756efe882c1cf59152a73071072ce8b34295..500ba005ae607319db55ee5faf60847d2bc4bf87 100644 GIT binary patch delta 1179 zcmV;M1Z4Y~9i$168Gi!+000dlDL?=K0K-sBR7C;PYXH(|0MKLr(Psbu{{YZp1kz~z z{{6!9*%8!n`ThG#-jN&Db@Tl97u9nN(`}{h$SBx-@cj1J_vfnb%VpxBAl7&g)NcsV zYUTRx+xY3w_TtO+-?#D8lB>iY7$^47EP(XjB&Sm2r@*LvXi?8o%nn(V<*-<1^9a-r?T zi|M#M+=@BchmY#IT;ZG3_T)5k5X}Gp1Dr`jK~zY`&6d}i+CU72qcS#Y<4P~4_uh6X z3%hy$r;2SL1AnH)xyTn?2{ZrbSR-lt`#&q?C@tO zqN%sM_Zpu}t(Vs$M?rWk7IPcB&O9xrzuMi*C^KyB5)Eb}F`8TTS?m^{Dy7U!9RyZU!5uE z<#bR#1%Je7I!vqjNhx5{a41f*<3UTGl#)4JAjE+|Ner^baMhmu@>Enfg75aKvo^4_W;u2bSuK>^$_` zmSS3P{@*Is{r0?%SY%iIxg=khE_m{3pq))rmWkg-8bN-W>)8a_`X zz->jX4P3)hu&b#pf}=LkZ}6uA&tUMwrnu=Ov)MNQT)Mor2z(YthT2BSM&M%|n|~Gc zy@v!4{uKKnd&!`mTmCCZHUig!$Ur?mtiM>^=BpW(sv@`JhAw>eF)Xq>_QPJ+U#`iG zr5EfV(OVdmOv4W=q7_6fW}ZtqcaQ4eaq%*&ls+nc=1H=*aKkWoeSdqPHy?chZ|hv# t;G^vUo?k(>3>(`(p*ZNRvVUd202IcBM1Rmln|A;J002ovPDHLkV1h(LVyOTC literal 3738 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 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",