From a5509a0171c90f4e14603e374784f877c05c29df Mon Sep 17 00:00:00 2001 From: michielmulders Date: Tue, 15 Aug 2017 21:18:20 +0200 Subject: [PATCH] Revert "Fix Issue 50: connection.js remove onlyJsonResponse" This reverts commit 3c9ff5c3844ddd691ee2f4c4596f92841609ced3. --- src/connection.js | 7 +++++-- src/request.js | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/connection.js b/src/connection.js index 48f387a..d7de2cb 100644 --- a/src/connection.js +++ b/src/connection.js @@ -89,8 +89,9 @@ export default class Connection { * @public * @param publicKey * @param spent + * @param onlyJsonResponse */ - listOutputs(publicKey, spent) { + listOutputs(publicKey, spent, onlyJsonResponse = true) { const query = { public_key: publicKey } @@ -101,7 +102,7 @@ export default class Connection { } return this._req(this.getApiUrls('outputs'), { query - }) + }, onlyJsonResponse) } /** @@ -158,6 +159,7 @@ export default class Connection { /** * @public + * * @param transaction */ postTransaction(transaction) { @@ -170,6 +172,7 @@ export default class Connection { /** * @public + * * @param search */ searchAssets(search) { diff --git a/src/request.js b/src/request.js index 6d98843..f768ce2 100644 --- a/src/request.js +++ b/src/request.js @@ -12,7 +12,7 @@ const DEFAULT_REQUEST_CONFIG = { * Small wrapper around js-utility-belt's request that provides url resolving, * default settings, and response handling. */ -export default function request(url, config = {}) { +export default function request(url, config = {}, onlyJsonResponse = true) { // Load default fetch configuration and remove any falsy query parameters const requestConfig = Object.assign({}, DEFAULT_REQUEST_CONFIG, config, { query: config.query && sanitize(config.query) @@ -30,7 +30,7 @@ export default function request(url, config = {}) { } return baseRequest(apiUrl, requestConfig) - .then(res => (res.json())) + .then(res => (onlyJsonResponse ? res.json() : { json: res.json(), url: res.url })) .catch(err => { console.error(err) throw err