particle-api-js 9.4.0 → 10.0.0

package/lib/Agent.js

@@ -20,13 +20,17 @@ var _getIterator2 = require('babel-runtime/core-js/get-iterator');
 
 var _getIterator3 = _interopRequireDefault(_getIterator2);
 
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
 var _assign = require('babel-runtime/core-js/object/assign');
 
 var _assign2 = _interopRequireDefault(_assign);
 
-var _promise = require('babel-runtime/core-js/promise');
+var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
 
-var _promise2 = _interopRequireDefault(_promise);
+var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
 
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
@@ -36,33 +40,49 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _superagent = require('superagent');
+var _nodeFetch = require('node-fetch');
 
-var _superagent2 = _interopRequireDefault(_superagent);
+var _nodeFetch2 = _interopRequireDefault(_nodeFetch);
 
-var _superagentPrefix = require('superagent-prefix');
+var _formData = require('form-data');
 
-var _superagentPrefix2 = _interopRequireDefault(_superagentPrefix);
+var _formData2 = _interopRequireDefault(_formData);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _qs = require('qs');
+
+var _qs2 = _interopRequireDefault(_qs);
 
-/*
- ******************************************************************************
- Copyright (c) 2016 Particle Industries, Inc.  All rights reserved.
+var _fs = require('../fs');
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, either
- version 3 of the License, or (at your option) any later version.
+var _fs2 = _interopRequireDefault(_fs);
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
+var _package = require('../package.json');
 
- You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************
+var _package2 = _interopRequireDefault(_package);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * The object returned for a basic request
+ * @typedef {object} JSONResponse
+ * @property {number} statusCode	The HTTP response status
+ * @property {object} body		The endpoint's response parsed as a JSON
+ */
+
+/**
+ * The possible response from an API request
+ * @typedef {JSONResponse|Buffer|arrayBuffer} RequestResponse	The type is based on
+ * the request config and whether is on browser or node
+ */
+
+/**
+ * The error object generated in case of a failed request
+ * @typedef {object} RequestError
+ * @property {number} statusCode	The HTTP response status
+ * @property {string} errorDescription	Details on what caused the failed request
+ * @property {string} shortErrorDescription	Summarized version of the fail reason
+ * @property {object} body		The response object from the request
+ * @property {object} error		The error object from the request
  */
 
 var Agent = function () {
@@ -75,8 +95,19 @@ var Agent = function () {
 	(0, _createClass3.default)(Agent, [{
 		key: 'setBaseUrl',
 		value: function setBaseUrl(baseUrl) {
-			this.prefix = (0, _superagentPrefix2.default)(baseUrl);
+			this.baseUrl = baseUrl;
 		}
+
+		/**
+   * Make a GET request
+   * @param {string} uri		The URI to request
+   * @param {string} [auth]	Authorization token to use
+   * @param {object} [headers]	Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {object} [query] Key/Value pairs of query params
+   * @param {object} [context]	The invocation context, describing the tool and project
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   */
+
 	}, {
 		key: 'get',
 		value: function get(_ref) {
@@ -88,6 +119,17 @@ var Agent = function () {
 
 			return this.request({ uri: uri, method: 'get', auth: auth, headers: headers, query: query, context: context });
 		}
+
+		/**
+   * Make a HEAD request
+   * @param {string} uri		The URI to request
+   * @param {string} [auth]	Authorization token to use
+   * @param {object} [headers]	Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {object} [query] Key/Value pairs of query params
+   * @param {object} [context]	The invocation context, describing the tool and project
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   */
+
 	}, {
 		key: 'head',
 		value: function head(_ref2) {
@@ -99,6 +141,17 @@ var Agent = function () {
 
 			return this.request({ uri: uri, method: 'head', auth: auth, headers: headers, query: query, context: context });
 		}
+
+		/**
+   * Make a POST request
+   * @param {string} uri		The URI to request
+   * @param {string} [auth]	Authorization token to use
+   * @param {object} [headers]	Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {object} [data] Payload to send in the request body in JSON format
+   * @param {object} [context]	The invocation context, describing the tool and project
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   */
+
 	}, {
 		key: 'post',
 		value: function post(_ref3) {
@@ -110,6 +163,17 @@ var Agent = function () {
 
 			return this.request({ uri: uri, method: 'post', auth: auth, headers: headers, data: data, context: context });
 		}
+
+		/**
+   * Make a PUT request
+   * @param {string} uri		The URI to request
+   * @param {string} [auth]	Authorization token to use
+   * @param {object} [headers]	Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {object} [data] Payload to send in the request body in JSON format
+   * @param {object} [context]	The invocation context, describing the tool and project
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   */
+
 	}, {
 		key: 'put',
 		value: function put(_ref4) {
@@ -121,6 +185,17 @@ var Agent = function () {
 
 			return this.request({ uri: uri, method: 'put', auth: auth, headers: headers, data: data, context: context });
 		}
+
+		/**
+   * Make a DELETE request
+   * @param {string} uri		The URI to request
+   * @param {string} [auth]	Authorization token to use
+   * @param {object} [headers]	Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {object} [data] Payload to send in the request body in JSON format
+   * @param {object} [context]	The invocation context, describing the tool and project
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   */
+
 	}, {
 		key: 'delete',
 		value: function _delete(_ref5) {
@@ -135,16 +210,18 @@ var Agent = function () {
 
 		/**
    *
-   * @param {String} uri           The URI to request
-   * @param {String} method        The method used to request the URI, should be in uppercase.
-   * @param {Object} headers       Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
-   * @param {String} data          Arbitrary data to send as the body.
-   * @param {Object} auth          Authorization
-   * @param {String} query         Query parameters
-   * @param {Object} form          Form fields
-   * @param {Object} files         array of file names and file content
-   * @parma {Object} context       the invocation context, describing the tool and project.
-   * @return {Promise} A promise. fulfilled with {body, statusCode}, rejected with { statusCode, errorDescription, error, body }
+   * @param {Object} config		An obj with all the possible request configurations
+   * @param {String} config.uri		The URI to request
+   * @param {String} config.method        The method used to request the URI, should be in uppercase.
+   * @param {Object} config.headers       Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
+   * @param {Object} config.data          Arbitrary data to send as the body.
+   * @param {Object} config.auth          Authorization
+   * @param {String} config.query         Query parameters
+   * @param {Object} config.form          Form fields
+   * @param {Object} config.files         array of file names and file content
+   * @param {Object} config.context       the invocation context, describing the tool and project.
+   * @param {boolean} config.isBuffer	Indicate if the response should be treated as Buffer instead of JSON
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
    */
 
 	}, {
@@ -165,30 +242,85 @@ var Agent = function () {
 			    files = _ref6$files === undefined ? undefined : _ref6$files,
 			    _ref6$context = _ref6.context,
 			    context = _ref6$context === undefined ? undefined : _ref6$context,
-			    _ref6$raw = _ref6.raw,
-			    raw = _ref6$raw === undefined ? false : _ref6$raw;
+			    _ref6$isBuffer = _ref6.isBuffer,
+			    isBuffer = _ref6$isBuffer === undefined ? false : _ref6$isBuffer;
 
 			var requestFiles = this._sanitizeFiles(files);
-			return this._request({ uri: uri, method: method, headers: headers, data: data, auth: auth, query: query, form: form, context: context, files: requestFiles, raw: raw });
+			var requestParams = this._buildRequest({ uri: uri, method: method, headers: headers, data: data, auth: auth, query: query, form: form, context: context, files: requestFiles });
+			return this._promiseResponse(requestParams, isBuffer);
 		}
 
 		/**
-   *
-   * @param {String} uri           The URI to request
-   * @param {String} method        The method used to request the URI, should be in uppercase.
-   * @param {Object} headers       Key/Value pairs like `{ 'X-FOO': 'foo', X-BAR: 'bar' }` to send as headers.
-   * @param {String} data          Arbitrary data to send as the body.
-   * @param {Object} auth          Authorization
-   * @param {String} query         Query parameters
-   * @param {Object} form          Form fields
-   * @param {Object} files         array of file names and file content
-   * @param {Object} context       the invocation context
-   * @return {Promise} A promise. fulfilled with {body, statusCode}, rejected with { statusCode, errorDescription, error, body }
+   * Promises to send the request and retreive the response.
+   * @param {[string, object]} requestParams	First argument is the URI to request, the second one are the options.
+   * @param {boolean} isBuffer Indicate if the response body should be returned as a Buffer (Node) / ArrayBuffer (browser) instead of JSON
+   * @param {Fetch} [makerequest] The fetch function to use. Override for testing.
+   * @returns {Promise<RequestResponse, RequestError>} A promise that resolves with either the requested data or an error object
+   * @private
    */
 
 	}, {
-		key: '_request',
-		value: function _request(_ref7) {
+		key: '_promiseResponse',
+		value: function _promiseResponse(requestParams, isBuffer) {
+			var _this = this;
+
+			var makerequest = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _nodeFetch2.default;
+
+			var status = void 0;
+			return makerequest.apply(undefined, (0, _toConsumableArray3.default)(requestParams)).then(function (resp) {
+				status = resp.status;
+				if (!resp.ok) {
+					return resp.text().then(function (err) {
+						var objError = JSON.parse(err);
+						// particle-commnds/src/cmd/api expects response.text. to be a string
+						var response = (0, _assign2.default)(resp, { text: err });
+						throw (0, _assign2.default)(objError, { response: response });
+					});
+				}
+				if (status === 204) {
+					// Can't do resp.json() since there is no body to parse
+					return '';
+				}
+				if (isBuffer) {
+					return resp.blob();
+				}
+				return resp.json();
+			}).then(function (body) {
+				if (isBuffer) {
+					return body.arrayBuffer().then(function (arrayBuffer) {
+						if (!_this.isForBrowser()) {
+							return Buffer.from(arrayBuffer);
+						}
+						return arrayBuffer;
+					});
+				}
+				return {
+					body: body,
+					statusCode: status
+				};
+			}).catch(function (error) {
+				var errorType = status ? 'HTTP error ' + status : 'Network error';
+				var errorDescription = errorType + ' from ' + requestParams[0];
+				var shortErrorDescription = void 0;
+				if (error.error_description) {
+					// Fetch responded with ok false
+					errorDescription = errorDescription + ' - ' + error.error_description;
+					shortErrorDescription = error.error_description;
+				}
+				var reason = new Error(errorDescription);
+				(0, _assign2.default)(reason, {
+					statusCode: status,
+					errorDescription: errorDescription,
+					shortErrorDescription: shortErrorDescription,
+					error: error,
+					body: error
+				});
+				throw reason;
+			});
+		}
+	}, {
+		key: '_buildRequest',
+		value: function _buildRequest(_ref7) {
 			var uri = _ref7.uri,
 			    method = _ref7.method,
 			    headers = _ref7.headers,
@@ -197,189 +329,132 @@ var Agent = function () {
 			    query = _ref7.query,
 			    form = _ref7.form,
 			    files = _ref7.files,
-			    context = _ref7.context,
-			    raw = _ref7.raw;
-
-			var req = this._buildRequest({ uri: uri, method: method, headers: headers, data: data, auth: auth, query: query, form: form, context: context, files: files });
+			    context = _ref7.context;
 
-			if (raw) {
-				return req;
+			var actualUri = uri;
+			if (this.baseUrl && uri[0] === '/') {
+				actualUri = '' + this.baseUrl + uri;
+			}
+			if (query) {
+				var queryParams = _qs2.default.stringify(query);
+				var hasParams = actualUri.includes('?');
+				actualUri = '' + actualUri + (hasParams ? '&' : '?') + queryParams;
 			}
-			return this._promiseResponse(req);
-		}
 
-		/**
-   * Promises to send the request and retreive the response.
-   * @param {Request} req The request to send
-   * @returns {Promise}   The promise to send the request and retrieve the response.
-   * @private
-   */
+			var userAgentHeader = { 'User-Agent': _package2.default.name + '/' + _package2.default.version + ' (' + _package2.default.repository.url + ')' };
+			var body = void 0;
+			var contentTypeHeader = void 0;
+			if (files) {
+				contentTypeHeader = {}; // Needed to allow fetch create its own
+				body = this._getFromData(files, form);
+			} else if (form) {
+				contentTypeHeader = { 'Content-Type': 'application/x-www-form-urlencoded' };
+				body = _qs2.default.stringify(form);
+			} else if (data) {
+				contentTypeHeader = { 'Content-Type': 'application/json' };
+				body = (0, _stringify2.default)(data);
+			}
+			var finalHeaders = (0, _assign2.default)({}, userAgentHeader, contentTypeHeader, this._getAuthorizationHeader(auth), this._getContextHeaders(context), headers);
 
+			return [actualUri, { method: method, body: body, headers: finalHeaders }];
+		}
 	}, {
-		key: '_promiseResponse',
-		value: function _promiseResponse(req) {
-			var _this = this;
-
-			return new _promise2.default(function (fulfill, reject) {
-				return _this._sendRequest(req, fulfill, reject);
-			});
+		key: 'isForBrowser',
+		value: function isForBrowser() {
+			return typeof window !== 'undefined';
 		}
-
-		/**
-   * Sends the given request, calling the fulfill or reject methods for success/failure.
-   * @param {object} request   The request to send
-   * @param {function} fulfill    Called on success with the response
-   * @param {function} reject     Called on failure with the failure reason.
-   * @private
-   * @returns {undefined} Nothing
-   */
-
 	}, {
-		key: '_sendRequest',
-		value: function _sendRequest(request, fulfill, reject) {
-			request.end(function (error, res) {
-				var body = res && res.body;
-				if (error) {
-					var uri = request.url;
-					var statusCode = error.status;
-					var errorDescription = (statusCode ? 'HTTP error ' + statusCode : 'Network error') + ' from ' + uri;
-					var shortErrorDescription = void 0;
-					if (body && body.error_description) {
-						errorDescription += ' - ' + body.error_description;
-						shortErrorDescription = body.error_description;
+		key: '_getFromData',
+		value: function _getFromData(files, form) {
+			var formData = new _formData2.default();
+			var _iteratorNormalCompletion = true;
+			var _didIteratorError = false;
+			var _iteratorError = undefined;
+
+			try {
+				for (var _iterator = (0, _getIterator3.default)((0, _entries2.default)(files)), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var _step$value = (0, _slicedToArray3.default)(_step.value, 2),
+					    name = _step$value[0],
+					    file = _step$value[1];
+
+					var path = file.path;
+					var fileData = file.data;
+					if (!this.isForBrowser()) {
+						var nodeFormData = this._getNodeFormData(file);
+						path = nodeFormData.path;
+						fileData = nodeFormData.file;
 					}
-					var reason = new Error(errorDescription);
-					(0, _assign2.default)(reason, { statusCode: statusCode, errorDescription: errorDescription, shortErrorDescription: shortErrorDescription, error: error, body: body });
-					reject(reason);
-				} else {
-					fulfill({
-						body: body,
-						statusCode: res.statusCode
-					});
+					formData.append(name, fileData, path);
 				}
-			});
-		}
-	}, {
-		key: '_buildRequest',
-		value: function _buildRequest(_ref8) {
-			var uri = _ref8.uri,
-			    method = _ref8.method,
-			    headers = _ref8.headers,
-			    data = _ref8.data,
-			    auth = _ref8.auth,
-			    query = _ref8.query,
-			    form = _ref8.form,
-			    files = _ref8.files,
-			    context = _ref8.context,
-			    _ref8$makerequest = _ref8.makerequest,
-			    makerequest = _ref8$makerequest === undefined ? _superagent2.default : _ref8$makerequest;
-
-			var req = makerequest(method, uri);
-			if (this.prefix) {
-				req.use(this.prefix);
-			}
-			this._authorizationHeader(req, auth);
-			if (context) {
-				this._applyContext(req, context);
-			}
-			if (query) {
-				req.query(query);
-			}
-			if (headers) {
-				req.set(headers);
-			}
-			if (files) {
-				var _iteratorNormalCompletion = true;
-				var _didIteratorError = false;
-				var _iteratorError = undefined;
-
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
 				try {
-					for (var _iterator = (0, _getIterator3.default)((0, _entries2.default)(files)), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-						var _step$value = (0, _slicedToArray3.default)(_step.value, 2),
-						    name = _step$value[0],
-						    file = _step$value[1];
-
-						// API for Form Data is different in Node and in browser
-						var options = {
-							filepath: file.path
-						};
-						if (this.isForBrowser(makerequest)) {
-							options = file.path;
-						}
-						req.attach(name, file.data, options);
+					if (!_iteratorNormalCompletion && _iterator.return) {
+						_iterator.return();
 					}
-				} catch (err) {
-					_didIteratorError = true;
-					_iteratorError = err;
 				} finally {
-					try {
-						if (!_iteratorNormalCompletion && _iterator.return) {
-							_iterator.return();
-						}
-					} finally {
-						if (_didIteratorError) {
-							throw _iteratorError;
-						}
+					if (_didIteratorError) {
+						throw _iteratorError;
 					}
 				}
+			}
 
-				if (form) {
-					var _iteratorNormalCompletion2 = true;
-					var _didIteratorError2 = false;
-					var _iteratorError2 = undefined;
+			if (form) {
+				var _iteratorNormalCompletion2 = true;
+				var _didIteratorError2 = false;
+				var _iteratorError2 = undefined;
 
-					try {
-						for (var _iterator2 = (0, _getIterator3.default)((0, _entries2.default)(form)), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-							var _step2$value = (0, _slicedToArray3.default)(_step2.value, 2),
-							    name = _step2$value[0],
-							    value = _step2$value[1];
+				try {
+					for (var _iterator2 = (0, _getIterator3.default)((0, _entries2.default)(form)), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+						var _step2$value = (0, _slicedToArray3.default)(_step2.value, 2),
+						    name = _step2$value[0],
+						    value = _step2$value[1];
 
-							req.field(name, value);
+						formData.append(name, value);
+					}
+				} catch (err) {
+					_didIteratorError2 = true;
+					_iteratorError2 = err;
+				} finally {
+					try {
+						if (!_iteratorNormalCompletion2 && _iterator2.return) {
+							_iterator2.return();
 						}
-					} catch (err) {
-						_didIteratorError2 = true;
-						_iteratorError2 = err;
 					} finally {
-						try {
-							if (!_iteratorNormalCompletion2 && _iterator2.return) {
-								_iterator2.return();
-							}
-						} finally {
-							if (_didIteratorError2) {
-								throw _iteratorError2;
-							}
+						if (_didIteratorError2) {
+							throw _iteratorError2;
 						}
 					}
 				}
-			} else if (form) {
-				req.type('form');
-				req.send(form);
-			} else if (data) {
-				req.send(data);
 			}
-			return req;
+			return formData;
 		}
 	}, {
-		key: 'isForBrowser',
-		value: function isForBrowser() {
-			var makerequest = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _superagent2.default;
-
-			// superagent only has the getXHR method in the browser version
-			return !!makerequest.getXHR;
+		key: '_getNodeFormData',
+		value: function _getNodeFormData(file) {
+			var fileData = file.data;
+			if (typeof file.data === 'string') {
+				fileData = _fs2.default.createReadStream(file.data);
+			}
+			return {
+				file: fileData,
+				path: { filepath: file.path // Different API for nodejs
+				} };
 		}
 	}, {
-		key: '_applyContext',
-		value: function _applyContext(req, context) {
-			if (context.tool) {
-				this._addToolContext(req, context.tool);
-			}
-			if (context.project) {
-				this._addProjectContext(req, context.project);
-			}
+		key: '_getContextHeaders',
+		value: function _getContextHeaders() {
+			var context = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+			return (0, _assign2.default)({}, this._getToolContext(context.tool), this._getProjectContext(context.project));
 		}
 	}, {
-		key: '_addToolContext',
-		value: function _addToolContext(req, tool) {
+		key: '_getToolContext',
+		value: function _getToolContext() {
+			var tool = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
 			var value = '';
 			if (tool.name) {
 				value += this._toolIdent(tool);
@@ -411,8 +486,9 @@ var Agent = function () {
 				}
 			}
 			if (value) {
-				req.set('X-Particle-Tool', value);
+				return { 'X-Particle-Tool': value };
 			}
+			return {};
 		}
 	}, {
 		key: '_toolIdent',
@@ -432,12 +508,15 @@ var Agent = function () {
 			return value;
 		}
 	}, {
-		key: '_addProjectContext',
-		value: function _addProjectContext(req, project) {
+		key: '_getProjectContext',
+		value: function _getProjectContext() {
+			var project = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
 			var value = this._buildSemicolonSeparatedProperties(project, 'name');
 			if (value) {
-				req.set('X-Particle-Project', value);
+				return { 'X-Particle-Project': value };
 			}
+			return {};
 		}
 
 		/**
@@ -466,28 +545,31 @@ var Agent = function () {
 
 		/**
    * Adds an authorization header.
-   * @param {Request} req     The request to add the authorization header to.
-   * @param {object|string}  auth    The authorization. Either a string authorization bearer token,
-   *  or a username/password object.
-   * @returns {Request} req   The original request.
+   * @param {string}  auth    The authorization bearer token.
+   * @returns {object} The original request.
    */
 
 	}, {
-		key: '_authorizationHeader',
-		value: function _authorizationHeader(req, auth) {
-			if (auth) {
-				if (auth.username !== undefined) {
-					req.auth(auth.username, auth.password);
-				} else {
-					req.set({ Authorization: 'Bearer ' + auth });
-				}
+		key: '_getAuthorizationHeader',
+		value: function _getAuthorizationHeader(auth) {
+			if (!auth) {
+				return {};
+			}
+			if (typeof auth === 'string') {
+				return { Authorization: 'Bearer ' + auth };
+			}
+			var encoded = void 0;
+			if (this.isForBrowser()) {
+				encoded = btoa(auth.username + ':' + auth.password);
+			} else {
+				encoded = Buffer.from(auth.username + ':' + auth.password).toString('base64');
 			}
-			return req;
+			return { Authorization: 'Basic ' + encoded };
 		}
 
 		/**
    *
-   * @param {Array} files converts the file names to file, file1, file2.
+   * @param {Object} files converts the file names to file, file1, file2.
    * @returns {object} the renamed files.
    */
 
@@ -509,7 +591,24 @@ var Agent = function () {
 		}
 	}]);
 	return Agent;
-}();
+}(); /*
+      ******************************************************************************
+      Copyright (c) 2016 Particle Industries, Inc.  All rights reserved.
+     
+      This program is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License as published by the Free Software Foundation, either
+      version 3 of the License, or (at your option) any later version.
+     
+      This program is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.
+     
+      You should have received a copy of the GNU Lesser General Public
+      License along with this program; if not, see <http://www.gnu.org/licenses/>.
+      ******************************************************************************
+      */
 
 exports.default = Agent;
 module.exports = exports['default'];