Fixed callWithToken error handling.

remoting/webapp/host_list.js

 // Copyright (c) 2012 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
  * Class representing the host-list portion of the home screen UI.
  */
 
 'use strict';
@@ skipping 71 matching lines @@
  *     or false on failure.
  * @return {void} Nothing.
  */
 remoting.HostList.prototype.refresh = function(onDone) {
   /** @type {remoting.HostList} */
   var that = this;
   /** @param {XMLHttpRequest} xhr The response from the server. */
   var parseHostListResponse = function(xhr) {
     that.parseHostListResponse_(xhr, onDone);
   }
-  /** @param {string} token The OAuth2 token. */
+  /** @param {string?} token The OAuth2 token. */
   var getHosts = function(token) {
-    // TODO(simonmorris): Pass the access token in a header, not a URL
-    // parameter, when crbug.com/116574 has a better fix.
-    var params = { 'access_token': token };
-    remoting.xhr.get(
-        'https://www.googleapis.com/chromoting/v1/@me/hosts',
-        parseHostListResponse, params);
+    if (token) {
+      // TODO(simonmorris): Pass the access token in a header, not a URL
+      // parameter, when crbug.com/116574 has a better fix.
+      var params = { 'access_token': token };
+      remoting.xhr.get(
+          'https://www.googleapis.com/chromoting/v1/@me/hosts',
+          parseHostListResponse, params);
+    } else {
+      that.lastError_ = remoting.Error.AUTHENTICATION_FAILED;
+      onDone(false);
+    }
   };
   remoting.oauth2.callWithToken(getHosts);
 };
 
 /**
  * Handle the results of the host list request.  A success response will
  * include a JSON-encoded list of host descriptions, which we display if we're
  * able to successfully parse it.
  *
  * @param {XMLHttpRequest} xhr The XHR object for the host list request.
@@ skipping 109 matching lines @@
   }
   remoting.HostList.unregisterHostById(hostTableEntry.host.hostId);
 };
 
 /**
  * Unregister a host.
  * @param {string} hostId The id of the host to be removed.
  * @return {void} Nothing.
  */
 remoting.HostList.unregisterHostById = function(hostId) {
-  /** @param {string} token The OAuth2 token. */
+  /** @param {string?} token The OAuth2 token. */
   var deleteHost = function(token) {
-    var headers = { 'Authorization': 'OAuth ' + token };
-    remoting.xhr.remove(
-        'https://www.googleapis.com/chromoting/v1/@me/hosts/' + hostId,
-        function() {}, '', headers);
+    if (token) {
+      var headers = { 'Authorization': 'OAuth ' + token };
+      remoting.xhr.remove(
+          'https://www.googleapis.com/chromoting/v1/@me/hosts/' + hostId,
+          function() {}, '', headers);
+    } else {
+      console.error('Could not unregister host. Authentication failure.');
+      // TODO(jamiewalch): Add a callback to signify success/failure?
+    }
   }
   remoting.oauth2.callWithToken(deleteHost);
 };
 
 /**
  * Prepare a host for renaming by replacing its name with an edit box.
  * @param {remoting.HostTableEntry} hostTableEntry The host to be renamed.
  * @return {void} Nothing.
  */
 remoting.HostList.prototype.renameHost = function(hostTableEntry) {
   for (var i = 0; i < this.hosts_.length; ++i) {
     if (this.hosts_[i].hostId == hostTableEntry.host.hostId) {
       this.hosts_[i].hostName = hostTableEntry.host.hostName;
       break;
     }
   }
   window.localStorage.setItem(remoting.HostList.HOSTS_KEY,
                               JSON.stringify(this.hosts_));
 
-  /** @param {string} token */
+  /** @param {string?} token */
   var renameHost = function(token) {
-    var headers = {
-      'Authorization': 'OAuth ' + token,
-      'Content-type' : 'application/json; charset=UTF-8'
-    };
-    var newHostDetails = { data: {
-      hostId: hostTableEntry.host.hostId,
-      hostName: hostTableEntry.host.hostName,
-      publicKey: hostTableEntry.host.publicKey
-    } };
-    remoting.xhr.put(
-        'https://www.googleapis.com/chromoting/v1/@me/hosts/' +
-        hostTableEntry.host.hostId,
-        function(xhr) {},
-        JSON.stringify(newHostDetails),
-        headers);
+    if (token) {
+      var headers = {
+        'Authorization': 'OAuth ' + token,
+        'Content-type' : 'application/json; charset=UTF-8'
+      };
+      var newHostDetails = { data: {
+       hostId: hostTableEntry.host.hostId,
+       hostName: hostTableEntry.host.hostName,
+       publicKey: hostTableEntry.host.publicKey
+        } };
+      remoting.xhr.put(
+          'https://www.googleapis.com/chromoting/v1/@me/hosts/' +
+          hostTableEntry.host.hostId,
+          function(xhr) {},
+          JSON.stringify(newHostDetails),
+          headers);
+    } else {
+      console.error('Could not rename host. Authentication failure.');
+    }
   }
   remoting.oauth2.callWithToken(renameHost);
 };
 
 /**
  * Add a host to the list. This is called when the local host is started to
  * avoid having to refresh the host list and deal with replication delays.
  *
  * @param {remoting.Host} localHost The local Me2Me host.
  * @return {void} Nothing.
  */
 remoting.HostList.prototype.addHost = function(localHost) {
   this.hosts_.push(localHost);
   window.localStorage.setItem(remoting.HostList.HOSTS_KEY,
                               JSON.stringify(this.hosts_));
 }
 
 /**
  * Key name under which Me2Me hosts are cached.
  */
 remoting.HostList.HOSTS_KEY = 'me2me-cached-hosts';
 
 /** @type {remoting.HostList} */
 remoting.hostList = null;