Fix IT2Me.

remoting/webapp/session_connector_impl.js

 // Copyright 2013 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
  * Connect set-up state machine for Me2Me and IT2Me
  */
 
 'use strict';
@@ skipping 256 matching lines @@
  * @return {void} Nothing.
  */
 remoting.SessionConnectorImpl.prototype.connectIT2Me = function(accessCode) {
   var kSupportIdLen = 7;
   var kHostSecretLen = 5;
   var kAccessCodeLen = kSupportIdLen + kHostSecretLen;
 
   // Cancel any existing connect operation.
   this.cancel();
 
+  this.connectSignaling_();

[Sergey Ulanov, 2014/09/22 18:11:51]

connectSignaling_() connects signaling and then starts the client, but
connectIT2MeWithToken_ is still called below, so this would start the plugin
twice.

[Jamie, 2014/09/22 18:40:05]

Acknowledged.

+
   var normalizedAccessCode = this.normalizeAccessCode_(accessCode);
   if (normalizedAccessCode.length != kAccessCodeLen) {
     this.onError_(remoting.Error.INVALID_ACCESS_CODE);
     return;
   }
 
   this.hostId_ = normalizedAccessCode.substring(0, kSupportIdLen);
   this.passPhrase_ = normalizedAccessCode;
   this.connectionMode_ = remoting.ClientSession.Mode.IT2ME;
   remoting.identity.callWithToken(this.connectIT2MeWithToken_.bind(this),
@@ skipping 134 matching lines @@
  */
 remoting.SessionConnectorImpl.prototype.onIT2MeHostInfo_ = function(xhr) {
   this.pendingXhr_ = null;
   if (xhr.status == 200) {
     var host = /** @type {{data: {jabberId: string, publicKey: string}}} */
         jsonParseSafe(xhr.responseText);
     if (host && host.data && host.data.jabberId && host.data.publicKey) {
       this.hostJid_ = host.data.jabberId;
       this.hostPublicKey_ = host.data.publicKey;
       this.hostDisplayName_ = this.hostJid_.split('/')[0];
       this.createSession_();

[Sergey Ulanov, 2014/09/22 18:11:51]

I think you just need to replace this line with "this.connectSignaling_();"

(connectSignaling_() is not a good name - it also connects the client, so it
would be a good idea to rename it)

[Jamie, 2014/09/22 18:40:05]

Done
We have plenty of other examples of this sort of naming, where the function just
performs the next in a sequence of steps and is named according to that step.
It's a good example of where Promises can make things cleaner; each function now
just does the thing its name suggests and returns a Promise that the caller can
use to chain multiple such functions together. For now, I think this name is
good enough.

       return;
     } else {
       console.error('Invalid "support-hosts" response from server.');
     }
   } else {
     this.onError_(this.translateSupportHostsError_(xhr.status));
   }
 };
 
 /**
@@ skipping 161 matching lines @@
  * @param {function(remoting.Error):void} onError Callback on error.
  * @param {function(string, string):boolean} onExtensionMessage The handler for
  *     protocol extension messages. Returns true if a message is recognized;
  *     false otherwise.
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError, onExtensionMessage) {
   return new remoting.SessionConnectorImpl(
       clientContainer, onConnected, onError, onExtensionMessage);
 };