[Webapp Refactor] Remove It2Me connection code from SessionConnectorImpl.

remoting/webapp/crd/js/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 59 matching lines @@
    */
   this.requiredCapabilities_ = requiredCapabilities;
 
   /**
    * @type {string}
    * @private
    */
   this.defaultRemapKeys_ = defaultRemapKeys;
 
   /**
-   * @type {string}
-   * @private
-   */
-  this.clientJid_ = '';
-
-  /**
    * @type {remoting.DesktopConnectedView.Mode}
    * @private
    */
   this.connectionMode_ = remoting.DesktopConnectedView.Mode.ME2ME;
 
   /**
    * @type {remoting.SignalStrategy}
    * @private
    */
   this.signalStrategy_ = null;
@@ skipping 32 matching lines @@
    */
   this.logHostOfflineErrors_ = false;
 
   /**
    * @type {remoting.ClientSession}
    * @private
    */
   this.clientSession_ = null;
 
   /**
-   * @type {XMLHttpRequest}
-   * @private
-   */
-  this.pendingXhr_ = null;
-
-  /**
    * @type {remoting.CredentialsProvider}
    * @private
    */
   this.credentialsProvider_ = null;
 };
 
 /**
  * Initiate a Me2Me connection.
  *
  * This doesn't report host-offline errors because the connection will
  * be retried and retryConnectMe2Me is responsible for reporting these errors.
  *
  * @param {remoting.Host} host The Me2Me host to which to connect.
  * @param {function(boolean, function(string):void):void} fetchPin Function to
  *     interactively obtain the PIN from the user.
  * @param {string} clientPairingId The client id issued by the host when
  *     this device was paired, if it is already paired.
  * @param {string} clientPairedSecret The shared secret issued by the host when
  *     this device was paired, if it is already paired.
  * @return {void} Nothing.
  */
 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);
 };
 
 /**
  * Retry connecting to a Me2Me host after a connection failure.
  *
  * This is the same as connectMe2Me except that is will log errors if the
  * host is offline.
  *
  * @param {remoting.Host} host The Me2Me host to refresh.
  * @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_);
 };
 
 /**
  * Initiate a Me2App connection.
  *
  * @param {remoting.Host} host The Me2Me host to which to connect.
  * @param {function(string, string, string,
  *                  function(string, string): void): void}
  *     fetchThirdPartyToken Function to obtain a token from a third party
  *     authenticaiton server.
  * @return {void} Nothing.
  */
 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);
 };
 
 /**
  * Update the pairing info so that the reconnect function will work correctly.
  *
  * @param {string} clientId The paired client id.
  * @param {string} sharedSecret The shared secret.
  */
 remoting.SessionConnectorImpl.prototype.updatePairingInfo =
     function(clientId, sharedSecret) {
   var pairingInfo = this.credentialsProvider_.getPairingInfo();
   pairingInfo.id = clientId;
   pairingInfo.secret = sharedSecret;
 };
 
 /**
  * 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.
  */
 remoting.SessionConnectorImpl.prototype.reconnect = function() {
   if (this.connectionMode_ == remoting.DesktopConnectedView.Mode.IT2ME) {
     console.error('reconnect not supported for IT2Me.');
     return;
   }
   this.logHostOfflineErrors_ = false;
-  this.connectInternal_(this.host_, this.credentialsProvider_);
+  this.connect(this.connectionMode_, this.host_, this.credentialsProvider_);
 };
 
 /**
  * Cancel a connection-in-progress.
  */
 remoting.SessionConnectorImpl.prototype.cancel = function() {
   if (this.clientSession_) {
     this.clientSession_.removePlugin();
     this.clientSession_ = null;
   }
-  if (this.pendingXhr_) {
-    this.pendingXhr_.abort();
-    this.pendingXhr_ = null;
-  }
   this.reset();
 };
 
 /**
  * Get the connection mode (Me2Me or IT2Me)
  *
  * @return {remoting.DesktopConnectedView.Mode}
  */
 remoting.SessionConnectorImpl.prototype.getConnectionMode = function() {
   return this.connectionMode_;
@@ skipping 61 matching lines @@
       }
       break;
 
     case remoting.SignalStrategy.State.FAILED:
       this.onError_(this.signalStrategy_.getError());
       break;
   }
 };
 
 /**
- * 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() {
   // In some circumstances, the WCS <iframe> can get reloaded, which results
   // in a new clientJid and a new callback. In this case, remove the old
   // client plugin before instantiating a new one.
   if (this.clientSession_) {
     this.clientSession_.removePlugin();
     this.clientSession_ = null;
   }
@@ skipping 75 matching lines @@
 
     default:
       console.error('Unexpected client plugin state: ' + event.current);
       // This should only happen if the web-app and client plugin get out of
       // sync, and even then the version check should ensure compatibility.
       this.onError_(remoting.Error.MISSING_PLUGIN);
   }
 };
 
 /**
- * @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.
  * @param {function(remoting.ClientSession):void} onConnected Callback on
  *     success.
  * @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.
  * @param {function(remoting.Error):void} onConnectionFailed Callback for when
  *     the connection fails.
  * @param {Array<string>} requiredCapabilities Connector capabilities
  *     required by this application.
  * @param {string} defaultRemapKeys The default set of key mappings to use
  *     in the client session.
  * @return {remoting.SessionConnector}
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError, onExtensionMessage,
              onConnectionFailed, requiredCapabilities, defaultRemapKeys) {
   return new remoting.SessionConnectorImpl(clientContainer, onConnected,
                                            onError, onExtensionMessage,
                                            onConnectionFailed,
                                            requiredCapabilities,
                                            defaultRemapKeys);
 };