Skip to content

Commit 2de2cba

Browse files
avigoldmanavigoldman
authored
Merge pull request #204 from SparkPost/ISSUE-203
Issue 203
2 parents 8a5d142 + c5af38e commit 2de2cba

22 files changed

+267
-196
lines changed

‎lib/inboundDomains.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const withCallback = require('./Promise');
43
const api = 'inbound-domains';
54

65
module.exports = function(client) {
@@ -15,7 +14,7 @@ module.exports = function(client) {
1514
const options = {
1615
uri: api
1716
};
18-
return withCallback(client.get(options), callback);
17+
return client.get(options, callback);
1918
},
2019
/**
2120
* Get an inbound domain by its domain name
@@ -26,13 +25,13 @@ module.exports = function(client) {
2625
*/
2726
get: function(domain, callback) {
2827
if (!domain || typeof domain !== 'string') {
29-
return withCallback(Promise.reject(new Error('domain is required')), callback);
28+
return client.reject(new Error('domain is required'), callback);
3029
}
3130

3231
const options = {
3332
uri: `${api}/${domain}`
3433
};
35-
return withCallback(client.get(options), callback);
34+
return client.get(options, callback);
3635
},
3736
/**
3837
* Create a new inbound domain
@@ -43,14 +42,14 @@ module.exports = function(client) {
4342
*/
4443
create: function(createOpts, callback) {
4544
if (!createOpts || typeof createOpts !== 'object') {
46-
return withCallback(Promise.reject(new Error('create options are required')), callback);
45+
return client.reject(new Error('create options are required'), callback);
4746
}
4847

4948
const options = {
5049
uri: api
5150
, json: createOpts
5251
};
53-
return withCallback(client.post(options, callback), callback);
52+
return client.post(options, callback);
5453
},
5554
/**
5655
* Delete an existing inbound domain
@@ -61,13 +60,13 @@ module.exports = function(client) {
6160
*/
6261
delete: function(domain, callback) {
6362
if (!domain || typeof domain !== 'string') {
64-
return withCallback(Promise.reject(new Error('domain is required')), callback);
63+
return client.reject(new Error('domain is required'), callback);
6564
}
6665

6766
const options = {
6867
uri: `${api}/${domain}`
6968
};
70-
return withCallback(client.delete(options), callback);
69+
return client.delete(options, callback);
7170
}
7271
};
7372
};

‎lib/messageEvents.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const withCallback = require('./Promise');
43
const api = 'message-events';
54

65
/*
@@ -29,7 +28,7 @@ module.exports = function(client) {
2928
options.qs[paramname] = parameters[paramname];
3029
}
3130
});
32-
return withCallback(client.get(options), callback);
31+
return client.get(options, callback);
3332
}
3433
};
3534
};

‎lib/recipientLists.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const withCallback = require('./Promise');
43
const api = 'recipient-lists';
54

65
module.exports = function(client) {
@@ -16,7 +15,7 @@ module.exports = function(client) {
1615
const reqOpts = {
1716
uri: api
1817
};
19-
return withCallback(client.get(reqOpts), callback);
18+
return client.get(reqOpts, callback);
2019
},
2120

2221
/**
@@ -38,15 +37,15 @@ module.exports = function(client) {
3837
}
3938

4039
if (!id) {
41-
return withCallback(Promise.reject(new Error('id is required')), callback);
40+
return client.reject(new Error('id is required'), callback);
4241
}
4342

4443
const reqOpts = {
4544
uri: `${api}/${id}`,
4645
qs: options
4746
};
4847

49-
return withCallback(client.get(reqOpts), callback);
48+
return client.get(reqOpts, callback);
5049
},
5150

5251

@@ -61,7 +60,7 @@ module.exports = function(client) {
6160
*/
6261
create: function(recipientList, callback) {
6362
if (!recipientList || typeof recipientList !== 'object' || !recipientList.recipients) {
64-
return withCallback(Promise.reject(new Error('recipient list is required')), callback);
63+
return client.reject(new Error('recipient list is required'), callback);
6564
}
6665

6766
const reqOpts = {
@@ -72,7 +71,7 @@ module.exports = function(client) {
7271
}
7372
};
7473

75-
return withCallback(client.post(reqOpts), callback);
74+
return client.post(reqOpts, callback);
7675
},
7776

7877
/**
@@ -88,11 +87,11 @@ module.exports = function(client) {
8887
*/
8988
update: function(id, recipientList, callback) {
9089
if (!id) {
91-
return withCallback(Promise.reject(new Error('recipient list id is required')), callback);
90+
return client.reject(new Error('recipient list id is required'), callback);
9291
}
9392

9493
if (!recipientList || typeof recipientList === 'function') {
95-
return withCallback(Promise.reject(new Error('recipient list is required')), callback);
94+
return client.reject(new Error('recipient list is required'), callback);
9695
}
9796

9897
const reqOpts = {
@@ -103,7 +102,7 @@ module.exports = function(client) {
103102
}
104103
};
105104

106-
return withCallback(client.put(reqOpts), callback);
105+
return client.put(reqOpts, callback);
107106
},
108107

109108
/**
@@ -117,14 +116,14 @@ module.exports = function(client) {
117116
*/
118117
delete: function(id, callback) {
119118
if (!id || typeof id !== 'string') {
120-
return withCallback(Promise.reject(new Error('id is required')), callback);
119+
return client.reject(new Error('id is required'), callback);
121120
}
122121

123122
const reqOpts = {
124123
uri: `${api}/${id}`
125124
};
126125

127-
return withCallback(client.delete(reqOpts), callback);
126+
return client.delete(reqOpts, callback);
128127
}
129128
};
130129

‎lib/relayWebhooks.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const withCallback = require('./Promise');
43
const api = 'relay-webhooks';
54

65
module.exports = function(client) {
@@ -15,7 +14,7 @@ module.exports = function(client) {
1514
const reqOpts = {
1615
uri: api
1716
};
18-
return withCallback(client.get(reqOpts), callback);
17+
return client.get(reqOpts, callback);
1918
},
2019
/**
2120
* Get details about a specified relay webhook by its id
@@ -26,14 +25,14 @@ module.exports = function(client) {
2625
*/
2726
get: function(id, callback) {
2827
if (!id || typeof id !== 'string') {
29-
return withCallback(Promise.reject(new Error('id is required')), callback);
28+
return client.reject(new Error('id is required'), callback);
3029
}
3130

3231
const options = {
3332
uri: `${api}/${id}`
3433
};
3534

36-
return withCallback(client.get(options), callback);
35+
return client.get(options, callback);
3736
},
3837
/**
3938
* Create a new relay webhook
@@ -44,15 +43,15 @@ module.exports = function(client) {
4443
*/
4544
create: function(webhook, callback) {
4645
if (!webhook || typeof webhook !== 'object') {
47-
return withCallback(Promise.reject(new Error('webhook object is required')), callback);
46+
return client.reject(new Error('webhook object is required'), callback);
4847
}
4948

5049
const reqOpts = {
5150
uri: api
5251
, json: webhook
5352
};
5453

55-
return withCallback(client.post(reqOpts), callback);
54+
return client.post(reqOpts, callback);
5655
},
5756
/**
5857
* Update an existing relay webhook
@@ -64,19 +63,19 @@ module.exports = function(client) {
6463
*/
6564
update: function(id, webhook, callback) {
6665
if (!id || typeof id !== 'string') {
67-
return withCallback(Promise.reject(new Error('id is required')), callback);
66+
return client.reject(new Error('id is required'), callback);
6867
}
6968

7069
if (!webhook || typeof webhook !== 'object') {
71-
return withCallback(Promise.reject(new Error('webhook object is required')), callback);
70+
return client.reject(new Error('webhook object is required'), callback);
7271
}
7372

7473
const reqOpts = {
7574
uri: `${api}/${id}`
7675
, json: webhook
7776
};
7877

79-
return withCallback(client.put(reqOpts), callback);
78+
return client.put(reqOpts, callback);
8079
},
8180
/**
8281
* Delete an existing relay webhook
@@ -87,14 +86,14 @@ module.exports = function(client) {
8786
*/
8887
delete: function(id, callback) {
8988
if (!id || typeof id !== 'string') {
90-
return withCallback(Promise.reject(new Error('id is required')), callback);
89+
return client.reject(new Error('id is required'), callback);
9190
}
9291

9392
const options = {
9493
uri: `${api}/${id}`
9594
};
9695

97-
return withCallback(client.delete(options, callback), callback);
96+
return client.delete(options, callback);
9897
}
9998
};
10099
};

‎lib/sendingDomains.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
'use strict';
22

3-
const withCallback = require('./Promise');
43
const api = 'sending-domains';
54

65
module.exports = function(client) {
7-
86
return {
97
/**
108
* Lists all sending domains
@@ -17,7 +15,7 @@ module.exports = function(client) {
1715
uri: api
1816
};
1917

20-
return withCallback(client.get(options), callback);
18+
return client.get(options, callback);
2119
},
2220

2321
/**
@@ -29,14 +27,14 @@ module.exports = function(client) {
2927
*/
3028
get: function(domain, callback) {
3129
if (!domain || typeof domain === 'function') {
32-
return withCallback(Promise.reject(new Error('domain is required')), callback);
30+
return client.reject(new Error('domain is required'), callback);
3331
}
3432

3533
const options = {
3634
uri: `${api}/${domain}`
3735
};
3836

39-
return withCallback(client.get(options), callback);
37+
return client.get(options, callback);
4038
},
4139

4240
/**
@@ -48,15 +46,15 @@ module.exports = function(client) {
4846
*/
4947
create: function(createOpts, callback) {
5048
if (!createOpts || typeof createOpts !== 'object') {
51-
return withCallback(Promise.reject(new Error('create options are required')), callback);
49+
return client.reject(new Error('create options are required'), callback);
5250
}
5351

5452
const options = {
5553
uri: api,
5654
json: createOpts
5755
};
5856

59-
return withCallback(client.post(options), callback);
57+
return client.post(options, callback);
6058
},
6159

6260
/**
@@ -69,19 +67,19 @@ module.exports = function(client) {
6967
*/
7068
update: function(domain, updateOpts, callback) {
7169
if (typeof domain !== 'string') {
72-
return withCallback(Promise.reject(new Error('domain is required')), callback);
70+
return client.reject(new Error('domain is required'), callback);
7371
}
7472

7573
if (!updateOpts || typeof updateOpts !== 'object') {
76-
return withCallback(Promise.reject(new Error('update options are required')), callback);
74+
return client.reject(new Error('update options are required'), callback);
7775
}
7876

7977
const options = {
8078
uri: `${api}/${domain}`,
8179
json: updateOpts
8280
};
8381

84-
return withCallback(client.put(options), callback);
82+
return client.put(options, callback);
8583
},
8684

8785
/**
@@ -93,14 +91,14 @@ module.exports = function(client) {
9391
*/
9492
delete: function(domain, callback) {
9593
if (typeof domain !== 'string') {
96-
return withCallback(Promise.reject(new Error('domain is required')), callback);
94+
return client.reject(new Error('domain is required'), callback);
9795
}
9896

9997
const options = {
10098
uri: `${api}/${domain}`
10199
};
102100

103-
return withCallback(client.delete(options), callback);
101+
return client.delete(options, callback);
104102
},
105103

106104
/**
@@ -113,19 +111,19 @@ module.exports = function(client) {
113111
*/
114112
verify: function(domain, options, callback) {
115113
if (typeof domain !== 'string') {
116-
return withCallback(Promise.reject(new Error('domain is required')), callback);
114+
return client.reject(new Error('domain is required'), callback);
117115
}
118116

119117
if (!options || typeof options !== 'object') {
120-
return withCallback(Promise.reject(new Error('verification options are required')), callback);
118+
return client.reject(new Error('verification options are required'), callback);
121119
}
122120

123121
const reqOpts = {
124122
uri: `${api}/${domain}/verify`,
125123
json: options
126124
};
127125

128-
return withCallback(client.post(reqOpts), callback);
126+
return client.post(reqOpts, callback);
129127
}
130128
};
131129

0 commit comments

Comments
 (0)