Fixed callWithToken error handling.

remoting/webapp/host_controller.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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @constructor */
@@ skipping 185 matching lines @@
         /** @param {XMLHttpRequest} xhr */
         function (xhr) { onRegistered(privateKey, xhr); },
         JSON.stringify(newHostDetails),
         headers);
   };
 
   /** @param {string} privateKey
    *  @param {string} publicKey */
   function onKeyGenerated(privateKey, publicKey) {
     remoting.oauth2.callWithToken(
-        /** @param {string} oauthToken */
+        /** @param {string?} oauthToken */
         function(oauthToken) {
-          doRegisterHost(privateKey, publicKey, oauthToken);
+          if (oauthToken) {
+            doRegisterHost(privateKey, publicKey, oauthToken);
+          } else {
+            callback(remoting.HostController.AsyncResult.FAILED);

[Jamie, 2012/04/25 01:20:48]

We could probably use a more specific error code here, but it's unlikely that
this is the first OAuth failure the user has seen--the host list refresh will
probably fail first and that now has a very clear error message.

[simonmorris, 2012/04/25 16:59:41]

Maybe a TODO to add a more specific error code?

[Jamie, 2012/04/25 17:29:09]

Done.

+          }
         });
   };
 
   this.plugin_.generateKeyPair(onKeyGenerated);
 };
 
 /**
  * Stop the daemon process.
  * @param {function(remoting.HostController.AsyncResult):void} callback
  *     Callback to be called when finished.
@@ skipping 106 matching lines @@
   try {
     this.plugin_.getDaemonConfig(onConfig);
   } catch (err) {
     this.setHost(null);
     onDone();
   }
 };
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;