Merge branch 'master' into master

Author: eerootsus

README.md

@@ -23,11 +23,19 @@ To run unit tests, execute
 npm run test
 ```
 
+To run integration tests, execute 
+```bash
+export PIPEDRIVE_API_TOKEN=YOUR_API_TOKEN
+npm run test:integration
+```
+
+__Important!__ Integration tests will add data to the account, so please run with caution! 
+
 ## Licence
 This Pipedrive API client is distributed under the MIT licence.
 
 ## Contribution
-- Run tests
+- Run unit and integration tests
 - Make PR
 
 ## Options

lib/rest.js

@@ -5,14 +5,13 @@
 		qs = require('qs'),
 		log = require(__dirname + '/log'),
 		util = require('util'),
-		bundle = require('../package.json'),
 		EventEmitter= require('events').EventEmitter,
 		urllib = require('url'),
 		userAgent = require(__dirname + '/userAgent'),
 		_ = require('lodash'),
-		mime = require('mime'),
 		fs = require('fs'),
 		async = require('async'),
+		FormData = require('form-data'),
 		requestRate = 5;
 
 	module.exports = {
@@ -47,31 +46,22 @@
 		}
 
 		this.url = urllib.parse(url);
-		var boundary = 'JWBBV0Q07j8njeiL';
 
 		if (this.options.multipart) {
-			headers['content-type'] = 'multipart/form-data; boundary='+boundary;
-			payload = '';
+			var form = new FormData();
 
 			_.each(this.options.data, function(value, inputName) {
-				payload += '--'+boundary+'\r\n'+
-					'Content-Disposition: form-data;';
-				if(inputName == 'file_path' && fs.existsSync(value)) {
-					var parts = value.split(/\/|\\/);
+				if (inputName === 'file_path' && fs.existsSync(value)) {
+					var parts = value.split(/[\/\\]/);
 					var fileName = parts[parts.length - 1];
-
-					payload += 'name="file"; filename="'+fileName.replace(/"/g, '\"')+'"\r\n';
-					payload += 'Content-Type: '+mime.lookup(value);
-
-					value = fs.readFileSync(value);
+					form.append('file', fs.readFileSync(value), fileName);
 				} else {
-					payload += ' name="'+inputName.replace(/"/g, '\"')+'"';
+					form.append(inputName, value);
 				}
-
-				payload += '\r\n\r\n'+value+'\r\n';
 			});
-			payload += '--'+boundary+'--';
 
+			headers = form.getHeaders(headers);
+			payload = form.getBuffer();
 		}
 		else if (this.options.data) {
 			if (typeof this.options.data == 'string') {
@@ -102,7 +92,7 @@
 			rejectUnauthorized: process.env.PIPEDRIVE_API_HOST == 'api.pipedrive.com' ? true : false
 		};
 
-		log('Performing API request: ' + JSON.stringify(_.extend(requestOptions, { url: url }), null, 4));
+		log('Adding API request to queue: ' + JSON.stringify(_.extend(_.omit(requestOptions, this.options.multipart ? ['payload'] : []), { url: url }), null, 4));
 
 		requestQueue.push({ url: url, requestOptions: requestOptions }, (function(err, meta, body) {
 			if (!meta) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pipedrive",
-  "version": "9.0.0",
+  "version": "9.1.1",
   "description": "Pipedrive REST client for NodeJS",
   "keywords": [
     "pipedrive",
@@ -16,23 +16,23 @@
   "homepage": "https://github.com/pipedrive/client-nodejs",
   "main": "./lib/Pipedrive",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=8.0"
   },
   "repository": {
     "type": "git",
     "url": "http://github.com/pipedrive/client-nodejs.git"
   },
   "scripts": {
-    "test": "./node_modules/mocha/bin/mocha ./test/unit"
+    "test": "./node_modules/mocha/bin/mocha ./test/unit",
+    "test:integration": "./node_modules/mocha/bin/mocha --timeout 10000 ./test/integration"
   },
   "dependencies": {
     "async": "~0.9.0",
     "fetch": "~0.3.6",
+    "form-data": "^3.0.0",
+    "inflection": "^1.12.0",
     "lodash": "^4.17.15",
-    "mime": "~1.4.1",
-    "qs": "~6.0.4",
-    "sockjs-client": "^1.3.0",
-    "inflection": "^1.12.0"
+    "qs": "~6.0.4"
   },
   "devDependencies": {
     "chai": "^4.1.2",