Added better error and OAuth support in xhr.js.

remoting/webapp/crd/js/host_list_api_impl.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * REST API for host-list management.
  */
 
 /** @suppress {duplicate} */
@@ skipping 35 matching lines @@
  * Update the information for a host.
  *
  * @param {function():void} onDone
  * @param {function(!remoting.Error):void} onError
  * @param {string} hostId
  * @param {string} hostName
  * @param {string} hostPublicKey
  */
 remoting.HostListApiImpl.prototype.put =
     function(hostId, hostName, hostPublicKey, onDone, onError) {
-  /** @param {string} token */
-  var onToken = function(token) {
-    var newHostDetails = {
+  new remoting.Xhr({
+    method: 'PUT',
+    url: remoting.settings.DIRECTORY_API_BASE_URL + '/@me/hosts/' + hostId,
+    jsonContent: {
       'data': {
         'hostId': hostId,
         'hostName': hostName,
         'publicKey': hostPublicKey
       }
-    };
-    new remoting.Xhr({
-      method: 'PUT',
-      url: remoting.settings.DIRECTORY_API_BASE_URL + '/@me/hosts/' + hostId,
-      jsonContent: newHostDetails,
-      oauthToken: token
-    }).start().then(remoting.Xhr.defaultResponse(onDone, onError));
-  };
-  remoting.identity.getToken().then(onToken, remoting.Error.handler(onError));
+    },
+    useIdentity: true
+  }).start().then(remoting.HostListApiImpl.defaultResponse_(onDone, onError));
 };
 
 /**
  * Delete a host.
  *
  * @param {function():void} onDone
  * @param {function(!remoting.Error):void} onError
  * @param {string} hostId
  */
 remoting.HostListApiImpl.prototype.remove = function(hostId, onDone, onError) {
-  /** @param {string} token */
-  var onToken = function(token) {
-    new remoting.Xhr({
-      method: 'DELETE',
-      url: remoting.settings.DIRECTORY_API_BASE_URL + '/@me/hosts/' + hostId,
-      oauthToken: token
-    }).start().then(remoting.Xhr.defaultResponse(
-        onDone, onError, [remoting.Error.Tag.NOT_FOUND]));
-  };
-  remoting.identity.getToken().then(onToken, remoting.Error.handler(onError));
+  new remoting.Xhr({
+    method: 'DELETE',
+    url: remoting.settings.DIRECTORY_API_BASE_URL + '/@me/hosts/' + hostId,
+    useIdentity: true
+  }).start().then(remoting.HostListApiImpl.defaultResponse_(
+      onDone, onError, [remoting.Error.Tag.NOT_FOUND]));
 };
 
 /**
  * Handle the results of the host list request.  A success response will
  * include a JSON-encoded list of host descriptions, which is parsed and
  * passed to the callback.
  *
  * @param {function(Array<remoting.Host>):void} onDone
  * @param {function(!remoting.Error):void} onError
  * @param {!remoting.Xhr.Response} response
@@ skipping 25 matching lines @@
               base.getStringAttr(item, 'hostOfflineReason', '');
           return host;
       });
       onDone(hosts);
     }
   } else {
     onError(remoting.Error.fromHttpStatus(response.status));
   }
 };
 
+/**
+ * Generic success/failure response proxy.
+ *
+ * @param {function():void} onDone
+ * @param {function(!remoting.Error):void} onError
+ * @param {Array<remoting.Error.Tag>=} opt_ignoreErrors
+ * @return {function(!remoting.Xhr.Response):void}
+ * @private
+ */
+remoting.HostListApiImpl.defaultResponse_ = function(
+    onDone, onError, opt_ignoreErrors) {
+  /** @param {!remoting.Xhr.Response} response */
+  var result = function(response) {
+    var error = remoting.Error.fromHttpStatus(response.status);
+    if (error.isNone()) {
+      onDone();
+      return;
+    }
+
+    if (opt_ignoreErrors && error.hasTag.apply(error, opt_ignoreErrors)) {
+      onDone();
+      return;
+    }
+
+    onError(error);
+  };
+  return result;
+};
+
 /** @type {remoting.HostListApi} */
 remoting.hostListApi = new remoting.HostListApiImpl();
 
 })();