From ab037b1931cb32e4f82ddd088e7c13476236f83d Mon Sep 17 00:00:00 2001 From: Alexander Corn Date: Tue, 13 Dec 2016 00:45:38 -0500 Subject: [PATCH] Pass response body back to caller for inventory fetching --- components/http.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/http.js b/components/http.js index a26a3ba..30593bd 100644 --- a/components/http.js +++ b/components/http.js @@ -47,7 +47,7 @@ SteamCommunity.prototype.httpRequest = function(uri, options, callback, source) self.request(options, function (err, response, body) { var hasCallback = !!callback; - var httpError = options.checkHttpError !== false && self._checkHttpError(err, response, callback); + var httpError = options.checkHttpError !== false && self._checkHttpError(err, response, callback, body); var communityError = !options.json && options.checkCommunityError !== false && self._checkCommunityError(body, httpError ? function () {} : callback); // don't fire the callback if hasHttpError did it already var tradeError = !options.json && options.checkTradeError !== false && self._checkTradeError(body, httpError || communityError ? function () {} : callback); // don't fire the callback if either of the previous already did var jsonError = options.json && options.checkJsonError !== false && !body ? new Error("Malformed JSON response") : null; @@ -85,29 +85,29 @@ SteamCommunity.prototype._notifySessionExpired = function(err) { this.emit('sessionExpired', err); }; -SteamCommunity.prototype._checkHttpError = function(err, response, callback) { +SteamCommunity.prototype._checkHttpError = function(err, response, callback, body) { if (err) { - callback(err); + callback(err, response, body); return err; } if (response.statusCode >= 300 && response.statusCode <= 399 && response.headers.location.indexOf('/login') != -1) { err = new Error("Not Logged In"); - callback(err); + callback(err, response, body); this._notifySessionExpired(err); return err; } if (response.statusCode == 403 && response.body && response.body.match(/
Enter your PIN below to exit Family View.<\/div>/)) { err = new Error("Family View Restricted"); - callback(err); + callback(err, response, body); return err; } if (response.statusCode >= 400) { err = new Error("HTTP error " + response.statusCode); err.code = response.statusCode; - callback(err); + callback(err, response, body); return err; }