[Webapp Refactor] Remove It2Me connection code from SessionConnectorImpl.

remoting/webapp/crd/js/session_connector_impl.js

Index: remoting/webapp/crd/js/session_connector_impl.js
diff --git a/remoting/webapp/crd/js/session_connector_impl.js b/remoting/webapp/crd/js/session_connector_impl.js
index fdbd6f0ccc6b1d7bf30f0ba261f301c90c2d4ac0..3f6d03d5bd99e5b5bc43172754323982f86ebc8a 100644
--- a/remoting/webapp/crd/js/session_connector_impl.js
+++ b/remoting/webapp/crd/js/session_connector_impl.js
@@ -77,12 +77,6 @@ remoting.SessionConnectorImpl = function(clientContainer, onConnected, onError,
   this.defaultRemapKeys_ = defaultRemapKeys;
 
   /**
-   * @type {string}
-   * @private
-   */
-  this.clientJid_ = '';
-
-  /**
    * @type {remoting.DesktopConnectedView.Mode}
    * @private
    */
@@ -135,12 +129,6 @@ remoting.SessionConnectorImpl.prototype.reset = function() {
   this.clientSession_ = null;
 
   /**
-   * @type {XMLHttpRequest}
-   * @private
-   */
-  this.pendingXhr_ = null;
-
-  /**
    * @type {remoting.CredentialsProvider}
    * @private
    */
@@ -165,14 +153,14 @@ remoting.SessionConnectorImpl.prototype.reset = function() {
 remoting.SessionConnectorImpl.prototype.connectMe2Me =
     function(host, fetchPin, fetchThirdPartyToken,
              clientPairingId, clientPairedSecret) {
-  this.connectionMode_ = remoting.DesktopConnectedView.Mode.ME2ME;
   this.logHostOfflineErrors_ = false;
   var credentialsProvider = new remoting.CredentialsProvider({
     fetchPin: fetchPin,
     pairingInfo: { id: clientPairingId, secret: clientPairedSecret },
     fetchThirdPartyToken: fetchThirdPartyToken
   });
-  this.connectInternal_(host, credentialsProvider);
+  this.connect(
+      remoting.DesktopConnectedView.Mode.ME2ME, host, credentialsProvider);
 };
 
 /**
@@ -185,9 +173,9 @@ remoting.SessionConnectorImpl.prototype.connectMe2Me =
  * @return {void} Nothing.
  */
 remoting.SessionConnectorImpl.prototype.retryConnectMe2Me = function(host) {
-  this.connectionMode_ = remoting.DesktopConnectedView.Mode.ME2ME;
   this.logHostOfflineErrors_ = true;
-  this.connectInternal_(host, this.credentialsProvider_);
+  this.connect(remoting.DesktopConnectedView.Mode.ME2ME, host,
+               this.credentialsProvider_);
 };
 
 /**
@@ -202,12 +190,13 @@ remoting.SessionConnectorImpl.prototype.retryConnectMe2Me = function(host) {
  */
 remoting.SessionConnectorImpl.prototype.connectMe2App =
     function(host, fetchThirdPartyToken) {
-  this.connectionMode_ = remoting.DesktopConnectedView.Mode.APP_REMOTING;
   this.logHostOfflineErrors_ = true;
   var credentialsProvider = new remoting.CredentialsProvider({
     fetchThirdPartyToken : fetchThirdPartyToken
   });
-  this.connectInternal_(host, credentialsProvider);
+  this.connect(
+      remoting.DesktopConnectedView.Mode.APP_REMOTING, host,
+      credentialsProvider);
 };
 
 /**
@@ -226,51 +215,23 @@ remoting.SessionConnectorImpl.prototype.updatePairingInfo =
 /**
  * Initiates a connection.
  *
+ * @param {remoting.DesktopConnectedView.Mode} mode
  * @param {remoting.Host} host the Host to connect to.
  * @param {remoting.CredentialsProvider} credentialsProvider
  * @return {void} Nothing.
  * @private
  */
-remoting.SessionConnectorImpl.prototype.connectInternal_ =
-    function(host, credentialsProvider) {
+remoting.SessionConnectorImpl.prototype.connect =
+    function(mode, host, credentialsProvider) {
   // Cancel any existing connect operation.
   this.cancel();
-
+  this.connectionMode_ = mode;
   this.host_ = host;
   this.credentialsProvider_ = credentialsProvider;
   this.connectSignaling_();
 };
 
 /**
- * Initiate an IT2Me connection.
- *
- * @param {string} accessCode The access code as entered by the user.
- * @return {void} Nothing.
- */
-remoting.SessionConnectorImpl.prototype.connectIT2Me = function(accessCode) {

[kelvinp, 2015/03/06 01:58:20]

Moved to It2MeConnectFlow()

-  var kSupportIdLen = 7;
-  var kHostSecretLen = 5;
-  var kAccessCodeLen = kSupportIdLen + kHostSecretLen;
-
-  // Cancel any existing connect operation.
-  this.cancel();
-
-  var normalizedAccessCode = this.normalizeAccessCode_(accessCode);
-  if (normalizedAccessCode.length != kAccessCodeLen) {
-    this.onError_(remoting.Error.INVALID_ACCESS_CODE);
-    return;
-  }
-  var hostId = normalizedAccessCode.substring(0, kSupportIdLen);
-  this.credentialsProvider_ = new remoting.CredentialsProvider({
-    accessCode: normalizedAccessCode
-  });
-  this.connectionMode_ = remoting.DesktopConnectedView.Mode.IT2ME;
-  remoting.identity.getToken().then(
-      this.connectIT2MeWithToken_.bind(this, hostId),
-      remoting.Error.handler(this.onError_));
-};
-
-/**
  * Reconnect a closed connection.
  *
  * @return {void} Nothing.
@@ -281,7 +242,7 @@ remoting.SessionConnectorImpl.prototype.reconnect = function() {
     return;
   }
   this.logHostOfflineErrors_ = false;
-  this.connectInternal_(this.host_, this.credentialsProvider_);
+  this.connect(this.connectionMode_, this.host_, this.credentialsProvider_);
 };
 
 /**
@@ -292,10 +253,6 @@ remoting.SessionConnectorImpl.prototype.cancel = function() {
     this.clientSession_.removePlugin();
     this.clientSession_ = null;
   }
-  if (this.pendingXhr_) {
-    this.pendingXhr_.abort();
-    this.pendingXhr_ = null;
-  }
   this.reset();
 };
 
@@ -377,56 +334,6 @@ remoting.SessionConnectorImpl.prototype.onSignalingState_ = function(state) {
 };
 
 /**
- * Continue an IT2Me connection once an access token has been obtained.
- *
- * @param {string} hostId
- * @param {string} token An OAuth2 access token.
- * @return {void} Nothing.
- * @private
- */
-remoting.SessionConnectorImpl.prototype.connectIT2MeWithToken_ =

[kelvinp, 2015/03/06 01:58:20]

Moved to It2MeConnectFlow()

-    function(hostId, token) {
-  // Resolve the host id to get the host JID.
-  this.pendingXhr_ = remoting.xhr.start({
-    method: 'GET',
-    url: remoting.settings.DIRECTORY_API_BASE_URL + '/support-hosts/' +
-        encodeURIComponent(hostId),
-    onDone: this.onIT2MeHostInfo_.bind(this, hostId),
-    oauthToken: token
-  });
-};
-
-/**
- * Continue an IT2Me connection once the host JID has been looked up.
- *
- * @param {string} hostId
- * @param {XMLHttpRequest} xhr The server response to the support-hosts query.
- * @return {void} Nothing.
- * @private
- */
-remoting.SessionConnectorImpl.prototype.onIT2MeHostInfo_ =

[kelvinp, 2015/03/06 01:58:19]

Moved to It2MeConnectFlow()

-    function(hostId, xhr) {
-  this.pendingXhr_ = null;
-  if (xhr.status == 200) {
-    var host = /** @type {{data: {jabberId: string, publicKey: string}}} */
-        (base.jsonParseSafe(xhr.responseText));
-    if (host && host.data && host.data.jabberId && host.data.publicKey) {
-      this.host_ = new remoting.Host();
-      this.host_.hostId = hostId;
-      this.host_.jabberId = host.data.jabberId;
-      this.host_.publicKey = host.data.publicKey;
-      this.host_.hostName = host.data.jabberId.split('/')[0];
-      this.connectSignaling_();
-      return;
-    } else {
-      console.error('Invalid "support-hosts" response from server.');
-    }
-  } else {
-    this.onError_(this.translateSupportHostsError_(xhr.status));
-  }
-};
-
-/**
  * Creates ClientSession object.
  */
 remoting.SessionConnectorImpl.prototype.createSession_ = function() {
@@ -522,42 +429,10 @@ remoting.SessionConnectorImpl.prototype.onStateChange_ = function(event) {
 };
 
 /**
- * @param {number} error An HTTP error code returned by the support-hosts
- *     endpoint.
- * @return {remoting.Error} The equivalent remoting.Error code.
- * @private
- */
-remoting.SessionConnectorImpl.prototype.translateSupportHostsError_ =

[kelvinp, 2015/03/06 01:58:20]

Moved to It2MeConnectFlow()

-    function(error) {
-  switch (error) {
-    case 0: return remoting.Error.NETWORK_FAILURE;
-    case 404: return remoting.Error.INVALID_ACCESS_CODE;
-    case 502: // No break
-    case 503: return remoting.Error.SERVICE_UNAVAILABLE;
-    default: return remoting.Error.UNEXPECTED;
-  }
-};
-
-/**
- * Normalize the access code entered by the user.
- *
- * @param {string} accessCode The access code, as entered by the user.
- * @return {string} The normalized form of the code (whitespace removed).
- * @private
- */
-remoting.SessionConnectorImpl.prototype.normalizeAccessCode_ =
-    function(accessCode) {
-  // Trim whitespace.
-  return accessCode.replace(/\s/g, '');
-};
-
-
-/**
  * @constructor
  * @implements {remoting.SessionConnectorFactory}
  */
-remoting.DefaultSessionConnectorFactory = function() {
-};
+remoting.DefaultSessionConnectorFactory = function() {};
 
 /**
  * @param {HTMLElement} clientContainer Container element for the client view.