mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 06:34:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡ Small improvements to Msg91-Node

Browse source
This commit is contained in:
Jan Oberhauser 2019-12-20 16:35:00 -06:00
parent 13b925dab3
commit d169a5617f
2 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/nodes-base/nodes/Msg91/GenericFunctions.ts
View file

@ -24,19 +24,15 @@ export async function msg91ApiRequest(this: IHookFunctions | IExecuteFunctions,
if (query === undefined) {
query = {};
}
query.authkey = credentials.authkey as string;
}
query.authkey = credentials.authkey as string;
const options = {
method,
form: body,
qs: query,
uri: `https://api.msg91.com/api/sendhttp.php`,
auth: {
user: '',
pass: '',
},
uri: `https://api.msg91.com/api${endpoint}`,
json: true
};
@ -61,4 +57,4 @@ export async function msg91ApiRequest(this: IHookFunctions | IExecuteFunctions,
// If that data does not exist for some reason return the actual error
throw error;
}
}
}

54
packages/nodes-base/nodes/Msg91/Msg91.node.ts
View file

@ -46,7 +46,6 @@ export class Msg91 implements INodeType {
default: 'sms',
description: 'The resource to operate on.',
},
{
displayName: 'Operation',
name: 'operation',
@ -69,8 +68,27 @@ export class Msg91 implements INodeType {
description: 'The operation to perform.',
},
{
displayName: 'Sender',
name: 'sender',
displayName: 'From',
name: 'from',
type: 'string',
default: '',
placeholder: '4155238886',
required: true,
displayOptions: {
show: {
operation: [
'send',
],
resource: [
'sms',
],
},
},
description: 'The number from which to send the message.',
},
{
displayName: 'To',
name: 'to',
type: 'string',
default: '',
placeholder: '+14155238886',
@ -85,26 +103,7 @@ export class Msg91 implements INodeType {
],
},
},
description: 'The number from which to send the message',
},
{
displayName: 'To',
name: 'mobiles',
type: 'string',
default: '',
placeholder: 'Mobile Number With Country Code',
required: true,
displayOptions: {
show: {
operation: [
'send',
],
resource: [
'sms',
],
},
},
description: 'The number to which to send the message',
description: 'The number, with coutry code, to which to send the message.',
},
{
displayName: 'Message',
@ -145,7 +144,6 @@ export class Msg91 implements INodeType {
let endpoint: string;
for (let i = 0; i < items.length; i++) {
requestMethod = 'GET';
endpoint = '';
body = {};
qs = {};
@ -160,12 +158,12 @@ export class Msg91 implements INodeType {
// ----------------------------------
requestMethod = 'GET';
endpoint = 'https://api.msg91.com/api/sendhttp.php';
endpoint = '/sendhttp.php';
qs.route = 4;
qs.country = 0;
qs.sender = this.getNodeParameter('sender', i) as string;
qs.mobiles = this.getNodeParameter('mobiles', i) as string;
qs.sender = this.getNodeParameter('from', i) as string;
qs.mobiles = this.getNodeParameter('to', i) as string;
qs.message = this.getNodeParameter('message', i) as string;
} else {
@ -177,7 +175,7 @@ export class Msg91 implements INodeType {
const responseData = await msg91ApiRequest.call(this, requestMethod, endpoint, body, qs);
returnData.push(responseData as IDataObject);
returnData.push({ requestId: responseData });
}
return [this.helpers.returnJsonArray(returnData)];