Skip to content

Commit 2e09dfa

Browse files
plibbyplibby
committed
Explicit Promise method calls.
1 parent 28b5ad9 commit 2e09dfa

6 files changed

Lines changed: 44 additions & 53 deletions

File tree

‎src/account/index.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = class {
88
this.url = url;
99
this.agentOptions = agentOptions;
1010

11-
this.auth = { user: this.apiKey, pass: this.apiSecret };
11+
this.auth = { username: this.apiKey, password: this.apiSecret };
1212
}
1313

1414
status() {
@@ -17,10 +17,10 @@ module.exports = class {
1717
auth: this.auth
1818
})
1919
.then((response) => {
20-
const res = JSON.parse(response);
21-
if (!res.success) return reject(errorHandler(res.message));
22-
return resolve(res);
20+
const tempResponse = response;
21+
if (!response.data.success) return Promise.reject(errorHandler(response.data.message));
22+
return Promise.resolve(response.data);
2323
})
24-
.catch((err) => reject(err));
24+
.catch((err) => Promise.reject(err));
2525
}
2626
};

‎src/faxes/index.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ module.exports = class {
9696

9797
return request
9898
.post(`${this.url}/account/status`, form, {
99-
auth: auth
99+
auth: this.auth
100100
})
101101
.then((response) => {
102102
const res = JSON.parse(response);
103-
if (!res.success) return reject(errorHandler(res.message));
103+
if (!res.success) return Promise.reject(errorHandler(res.message));
104104
// eslint-disable-next-line max-len
105105
return resolve(new Fax(this.apiKey, this.apiSecret, this.url, res.success, res.message, res.data));
106106
})
107-
.catch((err) => reject(err));
107+
.catch((err) => Promise.reject(err));
108108
}
109109

110110
testReceive(options = {
@@ -126,14 +126,14 @@ module.exports = class {
126126

127127
return request
128128
.post(`${this.url}/faxes`, form, {
129-
auth: auth
129+
auth: this.auth
130130
})
131131
.then((response) => {
132132
const res = JSON.parse(response);
133-
if (!res.success) return reject(errorHandler(res.message));
133+
if (!res.success) return Promise.reject(errorHandler(res.message));
134134
return resolve(res);
135135
})
136-
.catch((err) => reject(err));
136+
.catch((err) => Promise.reject(err));
137137
}
138138

139139
listFaxes(options = {
@@ -160,13 +160,13 @@ module.exports = class {
160160

161161
return request
162162
.get(`${this.url}/faxes`, query, {
163-
auth: auth
163+
auth: this.auth
164164
})
165165
.then((response) => {
166166
const res = JSON.parse(response);
167-
if (!res.success) return reject(errorHandler(res.message));
167+
if (!res.success) return Promise.reject(errorHandler(res.message));
168168
return resolve(res);
169169
})
170-
.catch((err) => reject(err));
170+
.catch((err) => Promise.reject(err));
171171
}
172172
};

‎src/faxes/shared-methods.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ function cancel(url, id, auth, agentOptions) {
88
})
99
.then((response) => {
1010
const res = JSON.parse(response);
11-
if (!res.success) return reject(errorHandler(res.message));
11+
if (!res.success) return Promise.reject(errorHandler(res.message));
1212
return resolve(res);
1313
})
14-
.catch((err) => reject(err));
14+
.catch((err) => Promise.reject(err));
1515
}
1616

1717
function resend(url, id, auth, options = { id: null, callback_url: null }, agentOptions) {
@@ -24,10 +24,10 @@ function resend(url, id, auth, options = { id: null, callback_url: null }, agent
2424
})
2525
.then((response) => {
2626
const res = JSON.parse(response);
27-
if (!res.success) return reject(errorHandler(res.message));
27+
if (!res.success) return Promise.reject(errorHandler(res.message));
2828
return resolve(res);
2929
})
30-
.catch((err) => reject(err));
30+
.catch((err) => Promise.reject(err));
3131
}
3232

3333
function testDelete(url, id, auth, agentOptions) {
@@ -37,10 +37,10 @@ function testDelete(url, id, auth, agentOptions) {
3737
})
3838
.then((response) => {
3939
const res = JSON.parse(response);
40-
if (!res.success) return reject(errorHandler(res.message));
40+
if (!res.success) return Promise.reject(errorHandler(res.message));
4141
return resolve(res);
4242
})
43-
.catch((err) => reject(err));
43+
.catch((err) => Promise.reject(err));
4444
}
4545

4646
function getInfo(url, id, auth, agentOptions) {
@@ -50,17 +50,17 @@ function getInfo(url, id, auth, agentOptions) {
5050
})
5151
.then((response) => {
5252
const res = JSON.parse(response);
53-
if (!res.success) return reject(errorHandler(res.message));
53+
if (!res.success) return Promise.reject(errorHandler(res.message));
5454
return resolve(res);
5555
})
56-
.catch((err) => reject(err));
56+
.catch((err) => Promise.reject(err));
5757
}
5858

5959
function getFile(url, id, auth, options = { id: null, thumbnail: null }, agentOptions) {
6060
const thumbnail = options.thumbnail === undefined ? null : options.thumbnail;
6161

6262
if (!['s', 'l', null].includes(thumbnail)) {
63-
return reject(new Error('ThumbnailSizeInvalid: Must be \'s\', \'l\', or null (default) for full file.'));
63+
return Promise.reject(new Error('ThumbnailSizeInvalid: Must be \'s\', \'l\', or null (default) for full file.'));
6464
}
6565

6666
return request
@@ -70,7 +70,7 @@ function getFile(url, id, auth, options = { id: null, thumbnail: null }, agentOp
7070
thumbnail: thumbnail
7171
})
7272
.then((response) => resolve(response))
73-
.catch((err) => reject(err));
73+
.catch((err) => Promise.reject(err));
7474
}
7575

7676
function deleteFile(url, id, auth, agentOptions) {
@@ -80,10 +80,10 @@ function deleteFile(url, id, auth, agentOptions) {
8080
})
8181
.then((response) => {
8282
const res = JSON.parse(response);
83-
if (!res.success) return reject(errorHandler(res.message));
83+
if (!res.success) return Promise.reject(errorHandler(res.message));
8484
return resolve(res);
8585
})
86-
.catch((err) => reject(err));
86+
.catch((err) => Promise.reject(err));
8787
}
8888

8989
module.exports = {

‎src/phax-code/index.js‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,16 @@ module.exports = class {
1717
if (options[rec] !== null) form.append('rec', options[rec]);
1818
});
1919

20-
const req = {
21-
method: 'POST',
22-
url: `${this.url}/phax_codes`,
23-
auth: this.auth,
24-
agentOptions: this.agentOptions,
25-
};
26-
2720
return request
2821
.post(`${this.url}/phax_codes`, form, {
29-
auth: auth
22+
auth: this.auth
3023
})
3124
.then((response) => {
3225
const res = JSON.parse(response);
33-
if (!res.success) return reject(errorHandler(res.message));
26+
if (!res.success) return Promise.Promise.reject(errorHandler(res.message));
3427
return resolve(res);
3528
})
36-
.catch((err) => reject(err));
29+
.catch((err) => Promise.Promise.reject(err));
3730
}
3831

3932
get(options = { id: null, type: null }) {
@@ -44,17 +37,15 @@ module.exports = class {
4437
phaxCode = `phax_codes/${options.id}`;
4538
}
4639

47-
if (options.type !== null) req.type = options.type;
48-
4940
return request
5041
.get(`${this.url}/${phaxCode}`, {
51-
auth: auth
42+
auth: this.auth
5243
})
5344
.then((response) => {
5445
const res = JSON.parse(response);
55-
if (!res.success) return reject(errorHandler(res.message));
46+
if (!res.success) return Promise.Promise.reject(errorHandler(res.message));
5647
return resolve(res);
5748
})
58-
.catch((err) => reject(err));
49+
.catch((err) => Promise.Promise.reject(err));
5950
}
6051
};

‎src/phone-number/index.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ module.exports = class {
1818
})
1919
.then((response) => {
2020
const res = JSON.parse(response);
21-
if (!res.success) return reject(errorHandler(res.message));
21+
if (!res.success) return Promise.reject(errorHandler(res.message));
2222
return resolve(res);
2323
})
24-
.catch((err) => reject(err));
24+
.catch((err) => Promise.reject(err));
2525
}
2626

2727
listNumbers(options = { country_code: null, area_code: null }) {
@@ -38,10 +38,10 @@ module.exports = class {
3838
})
3939
.then((response) => {
4040
const res = JSON.parse(response);
41-
if (!res.success) return reject(errorHandler(res.message));
41+
if (!res.success) return Promise.reject(errorHandler(res.message));
4242
return resolve(res);
4343
})
44-
.catch((err) => reject(err));
44+
.catch((err) => Promise.reject(err));
4545
}
4646

4747
getNumberInfo(number) {
@@ -51,10 +51,10 @@ module.exports = class {
5151
})
5252
.then((response) => {
5353
const res = JSON.parse(response);
54-
if (!res.success) return reject(errorHandler(res.message));
54+
if (!res.success) return Promise.reject(errorHandler(res.message));
5555
return resolve(res);
5656
})
57-
.catch((err) => reject(err));
57+
.catch((err) => Promise.reject(err));
5858
}
5959

6060
provisionNumber(options = { country_code: null, area_code: null, callback_url: null }) {
@@ -71,9 +71,9 @@ module.exports = class {
7171
})
7272
.then((response) => {
7373
const res = JSON.parse(response);
74-
if (!res.success) return reject(errorHandler(res.message));
74+
if (!res.success) return Promise.reject(errorHandler(res.message));
7575
return resolve(res);
7676
})
77-
.catch((err) => reject(err));
77+
.catch((err) => Promise.reject(err));
7878
}
7979
};

‎src/public/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ module.exports = class {
3333
.get(`${this.url}/public/area_codes`, qs)
3434
.then((response) => {
3535
const res = JSON.parse(response);
36-
if (!res.success) return reject(errorHandler(res.message));
36+
if (!res.success) return Promise.reject(errorHandler(res.message));
3737
return resolve(res);
3838
})
39-
.catch((err) => reject(err));
39+
.catch((err) => Promise.reject(err));
4040
}
4141

4242
getCountries(options = {
@@ -47,9 +47,9 @@ module.exports = class {
4747
.get(`${this.url}/public/countries`)
4848
.then((response) => {
4949
const res = JSON.parse(response);
50-
if (!res.success) return reject(errorHandler(res.message));
50+
if (!res.success) return Promise.reject(errorHandler(res.message));
5151
return resolve(res);
5252
})
53-
.catch((err) => reject(err));
53+
.catch((err) => Promise.reject(err));
5454
}
5555
};

0 commit comments

Comments
 (0)