feat: migrate from deprecated request package to axios

package.json

@@ -14,7 +14,7 @@
     "chai": "^4.0.1",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "eslint": "^4.19.1",
+    "eslint": "^6.8.0",
     "istanbul": "^1.0.0-alpha.2",
     "lerna": "^3.19.0",
     "mocha": "^6.2.2",

packages/client/README.md

@@ -72,7 +72,7 @@ client.setDefaultHeader('User-Agent', 'Some user agent string');
 
 ## Change Request Defaults
 ```js
-client.setDefaultRequest('baseUrl', 'https://api.sendgrid.com/');
+client.setDefaultRequest('baseURL', 'https://api.sendgrid.com/');
 ```
 
 ## Overwrite Promise Implementation

packages/client/USAGE.md

@@ -56,7 +56,7 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   const queryParams = {
   'limit': 1
 };
-  request.qs = queryParams;
+  request.params = queryParams;
   request.method = 'GET';
   request.url = '/v3/access_settings/activity';
   client.request(request)
@@ -92,7 +92,7 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
     }
   ]
 };
-  request.body = data;
+  request.data = data;
   request.method = 'POST';
   request.url = '/v3/access_settings/whitelist';
   client.request(request)
@@ -122,7 +122,7 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
     3
   ]
 };
-  request.body = data;
+  request.data = data;
   request.method = 'DELETE';
   request.url = '/v3/access_settings/whitelist';
   client.request(request)

packages/client/package.json

@@ -28,8 +28,7 @@
   },
   "dependencies": {
     "@sendgrid/helpers": "^6.5.3",
-    "@types/request": "^2.48.4",
-    "request": "^2.88.0"
+    "axios": "^0.19.2"
   },
   "tags": [
     "http",

packages/client/src/classes/client.js

@@ -3,7 +3,7 @@
 /**
  * Dependencies
  */
-const http = require('request');
+const axios = require('axios');
 const pkg = require('../../package.json');
 const {
   helpers: {
@@ -29,14 +29,15 @@ class Client {
 
     //Default headers
     this.defaultHeaders = {
+      'Content-Type': 'application/json',
       'Accept': 'application/json',
       'User-agent': 'sendgrid/' + pkg.version + ';nodejs',
     };
 
     //Empty default request
     this.defaultRequest = {
-      json: true,
-      baseUrl: 'https://api.sendgrid.com/',
+      data: {},
+      baseURL: 'https://api.sendgrid.com/',
       url: '',
       method: 'GET',
       headers: {},
@@ -94,6 +95,12 @@ class Client {
       delete data.uri;
     }
 
+    // Ensure backwards compatibility from request module
+    data.data = data.body ? data.body : undefined;
+    delete data.body;
+    data.params = data.qs ? data.qs : undefined;
+    delete data.qs;
+
     //Merge data with empty request
     const request = mergeData(this.defaultRequest, data);
 
@@ -112,21 +119,25 @@ class Client {
 
     //Perform request
     const promise = new Promise((resolve, reject) => {
-      http(request, (error, response, body) => {
-
-        //Request error
-        if (error) {
+      axios(request)
+        .then(response => {
+          // Successful response
+          var parsedResponse = {
+            statusCode: response.status,
+            body: response.data,
+          };
+          return resolve([parsedResponse, response.data]);
+        })
+        .catch(error => {
+          // Response error
+          if (error.response) {
+            if (error.response.status >= 400) {
+              return reject(new ResponseError(error.response));
+            }
+          }
+          // Request error
           return reject(error);
-        }
-
-        //Response error
-        if (response.statusCode >= 400) {
-          return reject(new ResponseError(response));
-        }
-
-        //Successful response
-        resolve([response, body]);
-      });
+        });
     });
 
     // Throw and error incase function not passed