Added ability to register new hosts using GCD.

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 153 matching lines @@
     }
   });
   var newHostId = base.generateUuid();
   var pinHashPromise = this.hostDaemonFacade_.getPinHash(newHostId, hostPin);
 
   /** @type {boolean} */
   var hostRegistered = false;
 
   // Register the host and extract an optional auth code from the host
   // response.  The absence of an auth code is represented by an empty
   // string.

[Jamie, 2015/04/27 23:24:24]

Is this comment still correct?

[John Williams, 2015/04/28 20:27:40]

Fixed.

-  /** @type {!Promise<string>} */
-  var authCodePromise = Promise.all([
+  /** @type {!Promise<remoting.HostListApi.RegisterResult>} */
+  var regResultPromise = 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);
-  }).then(function(/** string */ result) {
+  }).then(function(/** remoting.HostListApi.RegisterResult */ result) {
     hostRegistered = true;
     return result;
   });
 
   // Get XMPP creditials.
-  var xmppCredsPromise = authCodePromise.then(function(authCode) {
-    if (authCode) {
+  var xmppCredsPromise = regResultPromise.then(function(regResult) {
+    if (regResult.authCode && regResult.email) {
+      // Use auth code and email supplied by GCD.
+      return that.hostDaemonFacade_.getRefreshTokenFromAuthCode(
+          regResult.authCode).then(function(token) {
+            return {
+              userEmail: regResult.email,
+              refreshToken: token
+            };
+          });
+    } else if (regResult.authCode) {
       // Use auth code supplied by Chromoting registry.
-      return that.hostDaemonFacade_.getCredentialsFromAuthCode(authCode);
+      return that.hostDaemonFacade_.getCredentialsFromAuthCode(
+          regResult.authCode);
     } else {
       // No authorization code returned, use regular Chrome
       // identity credential flow.
       return remoting.identity.getEmail().then(function(/** string */ email) {
         return {
           userEmail: email,
           refreshToken: remoting.oauth2.getRefreshToken()

[Jamie, 2015/04/27 23:24:24]

remoting.oauth2 is null for v2, so I think this should just be an assert.
Something like:

base.assert(result.authCode);
if (result.email) {
  // GCD
} else {
  // Chromoting
}

[John Williams, 2015/04/28 20:27:40]

Done.

         };
       });
     }
   });
 
   // Get as JID to use as the host owner.
-  var hostOwnerPromise = authCodePromise.then(function(authCode) {
-    if (authCode) {
+  var hostOwnerPromise = regResultPromise.then(function(regResult) {
+    if (regResult.authCode && !regResult.email) {

[Jamie, 2015/04/27 23:24:24]

This doesn't look right. You're never using regResult.email, even if it's
present.

[John Williams, 2015/04/28 20:27:40]

Done.

       return that.getClientBaseJid_();
     } else {
       return remoting.identity.getEmail();
     }
   });
 
   // Build an initial host configuration.
   /** @type {!Promise<!Object>} */
   var hostConfigNoOwnerPromise = Promise.all([
     hostNamePromise,
@@ skipping 13 matching lines @@
       host_secret_hash: hostSecretHash,
       private_key: keyPair.privateKey
     };
   });
 
   // Add host_owner and host_owner_email fields to the host config if
   // necessary.  This promise resolves to the same value as
   // hostConfigNoOwnerPromise, with not until the extra fields are
   // either added or determined to be redundant.
   /** @type {!Promise<!Object>} */
   var hostConfigWithOwnerPromise = Promise.all([

[John Williams, 2015/04/28 20:27:40]

I merged this with the function above since I realized there's no reason for
them to be separate.

     hostConfigNoOwnerPromise,
     hostOwnerPromise,
     remoting.identity.getEmail(),
     xmppCredsPromise
   ]).then(function(/** Array */ a) {
     var hostConfig = /** @type {!Object} */ (a[0]);
     var hostOwner = /** @type {string} */ (a[1]);
     var hostOwnerEmail = /** @type {string} */ (a[2]);
     var xmppCreds = /** @type {remoting.XmppCredentials} */ (a[3]);
     if (hostOwner != xmppCreds.userEmail) {
@@ skipping 251 matching lines @@
     emailPromise.then(function(/** string */ email) {
       signalStrategy.connect(remoting.settings.XMPP_SERVER, email, token);
     });
   });
 
   return result;
 };
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;