Updated handling of GCD devices.

remoting/webapp/crd/js/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 145 matching lines @@
   var hasOauthPromise =
       this.hasFeature(remoting.HostController.Feature.OAUTH_CLIENT);
   var keyPairPromise = this.hostDaemonFacade_.generateKeyPair();
   var hostClientIdPromise = hasOauthPromise.then(function(hasOauth) {
     if (hasOauth) {
       return that.hostDaemonFacade_.getHostClientId();
     } else {
       return null;
     }
   });
-  var newHostId = base.generateUuid();
-  var pinHashPromise = this.hostDaemonFacade_.getPinHash(newHostId, hostPin);
   var hostOwnerPromise = this.getClientBaseJid_();
 
   /** @type {boolean} */
   var hostRegistered = false;

[Jamie, 2015/06/08 21:44:34]

I don't think you need this variable any more.

[John Williams, 2015/06/09 19:46:30]

Good catch. Thanks.

 
   // Register the host and extract an auth code from the host response
   // and, optionally an email address for the robot account.
   /** @type {!Promise<remoting.HostListApi.RegisterResult>} */
   var registerResultPromise = Promise.all([
     hostClientIdPromise,
     hostNamePromise,
     keyPairPromise
   ]).then(function(/** Array */ a) {
     var hostClientId = /** @type {string} */ (a[0]);
     var hostName = /** @type {string} */ (a[1]);
     var keyPair = /** @type {remoting.KeyPair} */ (a[2]);
 
     return remoting.HostListApi.getInstance().register(
-        newHostId, hostName, keyPair.publicKey, hostClientId);
+        hostName, keyPair.publicKey, hostClientId);
   }).then(function(/** remoting.HostListApi.RegisterResult */ result) {
     hostRegistered = true;
     return result;
   });
 
+  // For convenience, make the host ID available as a separate promise.
+  /** @type {!Promise<string>} */
+  var hostIdPromise = registerResultPromise.then(function(registerResult) {
+    return registerResult.hostId;
+  });
+
+  // Get the PIN hash based on the host ID.
+  /** @type {!Promise<string>} */
+  var pinHashPromise = hostIdPromise.then(function(hostId) {
+    return that.hostDaemonFacade_.getPinHash(hostId, hostPin);
+  });
+
   // Get XMPP creditials.
   var xmppCredsPromise = registerResultPromise.then(function(registerResult) {
     base.debug.assert(registerResult.authCode != '');
     if (registerResult.email) {
       // Use auth code and email supplied by GCD.
       return that.hostDaemonFacade_.getRefreshTokenFromAuthCode(
           registerResult.authCode).then(function(token) {
             return {
               userEmail: registerResult.email,
               refreshToken: token
@@ skipping 21 matching lines @@
     var hostSecretHash = /** @type {string} */ (a[1]);
     var xmppCreds = /** @type {remoting.XmppCredentials} */ (a[2]);
     var keyPair = /** @type {remoting.KeyPair} */ (a[3]);
     var hostOwner = /** @type {string} */ (a[4]);
     var hostOwnerEmail = /** @type {string} */ (a[5]);
     var registerResult =
         /** @type {remoting.HostListApi.RegisterResult} */ (a[6]);
     var hostConfig = {
       xmpp_login: xmppCreds.userEmail,
       oauth_refresh_token: xmppCreds.refreshToken,
-      host_id: newHostId,
       host_name: hostName,
       host_secret_hash: hostSecretHash,
       private_key: keyPair.privateKey,
       host_owner: hostOwner
     };
     if (hostOwnerEmail != hostOwner) {
       hostConfig['host_owner_email'] = hostOwnerEmail;
     }
-    if (registerResult.gcdId) {
-      hostConfig['gcd_device_id'] = registerResult.gcdId;
+    if (registerResult.isLegacy) {
+      hostConfig['host_id'] = registerResult.hostId;
+    }
+    else {
+      hostConfig['gcd_device_id'] = registerResult.hostId;
     }
     return hostConfig;
   });
 
   // Start the daemon.
   /** @type {!Promise<remoting.HostController.AsyncResult>} */
   var startDaemonResultPromise =
       hostConfigPromise.then(function(hostConfig) {
         return that.hostDaemonFacade_.startDaemon(hostConfig, consent);
       });
 
   // Update the UI or report an error.
-  return startDaemonResultPromise.then(function(result) {
-    if (result == remoting.HostController.AsyncResult.OK) {
-      return hostNamePromise.then(function(hostName) {
-        return keyPairPromise.then(function(keyPair) {
-          remoting.hostList.onLocalHostStarted(
-              hostName, newHostId, keyPair.publicKey);
+  return hostIdPromise.then(function(hostId) {
+    return startDaemonResultPromise.then(function(result) {
+      if (result == remoting.HostController.AsyncResult.OK) {
+        return hostNamePromise.then(function(hostName) {
+          return keyPairPromise.then(function(keyPair) {
+            remoting.hostList.onLocalHostStarted(
+                hostName, hostId, keyPair.publicKey);
+          });
         });
-      });
-    } else if (result == remoting.HostController.AsyncResult.CANCELLED) {
-      throw new remoting.Error(remoting.Error.Tag.CANCELLED);
-    } else {
-      throw remoting.Error.unexpected();
-    }
-  }).catch(function(error) {
-    if (hostRegistered) {
-      remoting.hostList.unregisterHostById(newHostId);
-    }
-    throw error;
+      } else if (result == remoting.HostController.AsyncResult.CANCELLED) {
+        throw new remoting.Error(remoting.Error.Tag.CANCELLED);
+      } else {
+        throw remoting.Error.unexpected();
+      }
+    }).catch(function(error) {
+      if (hostId) {
+        remoting.hostList.unregisterHostById(hostId);
+      }
+      throw error;
+    });
   });
 };
 
 /**
  * Stop the daemon process.
  * @param {function():void} onDone Callback to be called when done.
  * @param {function(!remoting.Error):void} onError Callback to be called on
  *     error.
  * @return {void} Nothing.
  */
@@ skipping 108 matching lines @@
  *
  * @param {function(string?):void} onDone Completion callback.
  */
 remoting.HostController.prototype.getLocalHostId = function(onDone) {
   /** @type {remoting.HostController} */
   var that = this;
   /** @param {Object} config */
   function onConfig(config) {
     var hostId = null;
     if (isHostConfigValid_(config)) {
-      hostId = /** @type {string} */ (config['host_id']);
+      hostId = base.getStringAttr(

[Jamie, 2015/06/08 21:44:34]

Add a comment along the lines of "Use the gcd_device_id field if it exists, or
the host_id field otherwise." Bonus points for replacing "if it exists" with
something explaining under what conditions it is expected to exist.

[John Williams, 2015/06/09 19:46:30]

Done.  Didn't go for bonus points because this code is about to change again
anyway.

+          config, 'gcd_device_id', base.getStringAttr(config, 'host_id'));
     }
     onDone(hostId);
   };
 
   this.hostDaemonFacade_.getDaemonConfig().then(onConfig, function(error) {
     onDone(null);
   });
 };
 
 /**
@@ skipping 78 matching lines @@
     emailPromise.then(function(/** string */ email) {
       signalStrategy.connect(remoting.settings.XMPP_SERVER, email, token);
     });
   });
 
   return result;
 };
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;