Merge pull request #26 from phaxio/phaxio-node-upgrade

Phaxio node upgrade, v1.2.3

Author: billsimon

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "phaxio-official",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The official Node.JS library for Phaxio API v2.1.0. https://phaxio.com",
   "main": "index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "Jeremy Jackson <[email protected]> (https://voyant.com)",
   "license": "MIT",
   "dependencies": {
-    "request": "^2.88.0",
-    "request-promise-native": "^1.0.8"
+    "axios": "^1.6.5",
+    "request": "^2.88.0"
   },
   "devDependencies": {
     "dotenv": "^8.2.0",
     "eslint": "^6.6.0",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-plugin-import": "^2.18.2",
     "expect.js": "^0.3.1",
-    "mocha": "^6.2.2"
+    "mocha": "^10.2.0"
   }
 }

package.json

@@ -1,4 +1,4 @@
-const request = require('request-promise-native');
+const request = require('axios');
 const errorHandler = require('../error-handler');
 
 module.exports = class {
@@ -8,23 +8,19 @@ module.exports = class {
     this.url = url;
     this.agentOptions = agentOptions;
 
-    this.auth = { user: this.apiKey, pass: this.apiSecret };
+    this.auth = { username: this.apiKey, password: this.apiSecret };
   }
 
   status() {
-    return new Promise((resolve, reject) => {
-      request({
-        method: 'GET',
-        url: `${this.url}/account/status`,
-        auth: this.auth,
-        agentOptions: this.agentOptions,
+    return request
+      .get(`${this.url}/account/status`, {
+        auth: this.auth
       })
-        .then((response) => {
-          const res = JSON.parse(response);
-          if (!res.success) return reject(errorHandler(res.message));
-          return resolve(res);
-        })
-        .catch((err) => reject(err));
-    });
+      .then((response) => {
+        const tempResponse = response;
+        if (!response.data.success) return Promise.reject(errorHandler(response.data.message));
+        return Promise.resolve(response.data);
+      })
+      .catch((err) => Promise.reject(err));
   }
 };

src/account/index.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const request = require('request-promise-native');
+const request = require('axios');
 const errorHandler = require('../error-handler');
 
 const Fax = require('./fax');
@@ -66,23 +66,14 @@ module.exports = class {
     test_fail: null,
   }) {
     // eslint-disable-next-line consistent-return
-    return new Promise((resolve, reject) => {
       const formData = {};
 
       Object.keys(options).forEach((rec) => {
         if (options[rec] !== null) formData[rec] = options[rec];
         if (typeof formData[rec] === 'boolean') formData[rec] = formData[rec].toString();
       });
 
-      const req = {
-        method: 'POST',
-        url: `${this.url}/faxes`,
-        auth: this.auth,
-        agentOptions: this.agentOptions,
-      };
-
-      const caller = request(req);
-      const form = caller.form();
+      const form = new FormData();
       Object.keys(formData).forEach((key) => {
         if (typeof formData[key] === 'object' && key === 'tags' && formData[key] !== null) {
           Object.keys(formData[key]).forEach((tagkey) => {
@@ -103,47 +94,46 @@ module.exports = class {
         }
       });
 
-      caller
+      return request
+        .post(`${this.url}/account/status`, form, {
+          auth: this.auth
+        })
         .then((response) => {
           const res = JSON.parse(response);
-          if (!res.success) return reject(errorHandler(res.message));
+          if (!res.success) return Promise.reject(errorHandler(res.message));
           // eslint-disable-next-line max-len
           return resolve(new Fax(this.apiKey, this.apiSecret, this.url, res.success, res.message, res.data));
         })
-        .catch((err) => reject(err));
-    });
+        .catch((err) => Promise.reject(err));
   }
 
   testReceive(options = {
     file: null,
     from_number: null,
     to_number: null,
   }) {
-    return new Promise((resolve, reject) => {
-      const formData = { direction: 'received' };
+    const form = new FormData();
 
-      Object.keys(options).forEach((rec) => {
-        if (rec === 'file' && options[rec] !== null) {
-          formData[rec] = fs.createReadStream(options[rec]);
-        } else if (options[rec] !== null) {
-          formData[rec] = options[rec];
-        }
-      });
+    form.append('direction', 'received');
 
-      request({
-        method: 'POST',
-        url: `${this.url}/faxes`,
-        auth: this.auth,
-        formData,
-        agentOptions: this.agentOptions,
-      })
-        .then((response) => {
-          const res = JSON.parse(response);
-          if (!res.success) return reject(errorHandler(res.message));
-          return resolve(res);
-        })
-        .catch((err) => reject(err));
+    Object.keys(options).forEach((rec) => {
+      if (rec === 'file' && options[rec] !== null) {
+        form.append('fileAttachment', fs.createReadStream(options[rec]));
+      } else if (options[rec] !== null) {
+        form.append('rec', options[rec]);
+      }
     });
+
+    return request
+      .post(`${this.url}/faxes`, form, {
+        auth: this.auth
+      })
+      .then((response) => {
+        const res = JSON.parse(response);
+        if (!res.success) return Promise.reject(errorHandler(res.message));
+        return resolve(res);
+      })
+      .catch((err) => Promise.reject(err));
   }
 
   listFaxes(options = {
@@ -156,32 +146,27 @@ module.exports = class {
     per_page: null,
     page: null,
   }) {
-    return new Promise((resolve, reject) => {
-      const query = {};
-      Object.keys(options).forEach((rec) => {
-        if (rec === 'tags' && typeof options[rec] === 'object' && options[rec] !== null) {
-          Object.keys(options[rec]).forEach((tag) => {
-            const newrec = `tag[${tag}]`;
-            query[newrec] = options[rec][tag];
-          });
-        } else if (options[rec] !== null) {
-          query[rec] = options[rec];
-        }
-      });
+    const query = {};
+    Object.keys(options).forEach((rec) => {
+      if (rec === 'tags' && typeof options[rec] === 'object' && options[rec] !== null) {
+        Object.keys(options[rec]).forEach((tag) => {
+          const newrec = `tag[${tag}]`;
+          query[newrec] = options[rec][tag];
+        });
+      } else if (options[rec] !== null) {
+        query[rec] = options[rec];
+      }
+    });
 
-      request({
-        method: 'GET',
-        url: `${this.url}/faxes`,
-        auth: this.auth,
-        qs: query,
-        agentOptions: this.agentOptions,
+    return request
+      .get(`${this.url}/faxes`, query, {
+        auth: this.auth
       })
-        .then((response) => {
-          const res = JSON.parse(response);
-          if (!res.success) return reject(errorHandler(res.message));
-          return resolve(res);
-        })
-        .catch((err) => reject(err));
-    });
+      .then((response) => {
+        const res = JSON.parse(response);
+        if (!res.success) return Promise.reject(errorHandler(res.message));
+        return resolve(res);
+      })
+      .catch((err) => Promise.reject(err));
   }
 };