From 0e3d68bdd9858be198c39b0da573eb5b85a85881 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 15 Oct 2012 03:08:35 -0400
Subject: [PATCH] Fix debug output password hiding for HTTP.promise(), and add
 'debug' option

'debug' option shows response text

The status code is also now displayed for 20x even without 'debug'.
---
 chrome/content/zotero/xpcom/http.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
index 7e476663c3..6803d3eb1e 100644
--- a/chrome/content/zotero/xpcom/http.js
+++ b/chrome/content/zotero/xpcom/http.js
@@ -41,6 +41,7 @@ Zotero.HTTP = new function() {
 	 *         <li>cookieSandbox - The sandbox from which cookies should be taken</li>
 	 *         <li>dontCache - If set, specifies that the request should not be fulfilled
 	 *             from the cache</li>
+	 *         <li>debug - Log response text and status code</li>
 	 *     </ul>
 	 * @param {Zotero.CookieSandbox} [cookieSandbox] Cookie sandbox object
 	 * @return {Promise} A promise resolved with the XMLHttpRequest object if the request
@@ -50,11 +51,15 @@ Zotero.HTTP = new function() {
 	this.promise = function promise(method, url, options) {
 		if (url instanceof Components.interfaces.nsIURI) {
 			// Don't display password in console
-			var disp = url.clone();
-			if (disp.password) {
-				disp.password = "********";
+			var dispURL = url.clone();
+			if (dispURL.password) {
+				dispURL.password = "********";
 			}
 			url = url.spec;
+			dispURL = dispURL.spec;
+		}
+		else {
+			var dispURL = url;
 		}
 		
 		if(options && options.body) {
@@ -66,14 +71,14 @@ Zotero.HTTP = new function() {
 			Zotero.debug("HTTP "+method+" "
 				+ (options.body.length > 1024 ?
 					bodyStart + '... (' + options.body.length + ' chars)' : bodyStart)
-				+ " to " + (disp ? disp.spec : url));
+				+ " to " + dispURL);
 		} else {
-			Zotero.debug("HTTP GET " + url);
+			Zotero.debug("HTTP GET " + dispURL);
 		}
 		
 		if (this.browserIsOffline()) {
 			return Q.fcall(function() {
-				Zotero.debug("HTTP GET " + url + " failed: Browser is offline");
+				Zotero.debug("HTTP GET " + dispURL + " failed: Browser is offline");
 				throw new this.BrowserOfflineException();
 			});
 		}
@@ -112,11 +117,14 @@ Zotero.HTTP = new function() {
 		
 		xmlhttp.onloadend = function() {
 			var status = xmlhttp.status;
+			if(options && options.debug && xmlhttp.responseText) {
+				Zotero.debug(xmlhttp.responseText);
+			}
 			if(status >= 200 && status < 300) {
-				Zotero.debug("HTTP GET " + url + " succeeded");
+				Zotero.debug("HTTP GET " + dispURL + " succeeded (" + xmlhttp.status + ")");
 				deferred.resolve(xmlhttp);
 			} else {
-				Zotero.debug("HTTP GET " + url + " failed: Unexpected status code "+xmlhttp.status);
+				Zotero.debug("HTTP GET " + dispURL + " failed: Unexpected status code " + xmlhttp.status);
 				deferred.reject(new Zotero.HTTP.UnexpectedStatusException(xmlhttp));
 			}
 		};