Webapp changes to support asking for a PIN

remoting/webapp/session_connector.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 88 matching lines @@
 
   /**
    * A timer that polls for an updated access token.
    *
    * @type {number}
    * @private
    */
   this.wcsAccessTokenRefreshTimer_ = 0;
 
   /**
+   * Function to interactively obtain the PIN from the user.
+   * @param {function(string):void} onPinFetched Called when the PIN is fetched.
+   * @private
+   */
+  this.fetchPin_ = function(onPinFetched) {};
+
+  /**
    * Host 'name', as displayed in the client tool-bar. For a Me2Me connection,
    * this is the name of the host; for an IT2Me connection, it is the email
    * address of the person sharing their computer.
    *
    * @type {string}
    * @private
    */
   this.hostDisplayName_ = '';
 
   // Pre-load WCS to improve connection time.
   remoting.identity.callWithToken(this.loadWcs_.bind(this), this.onError_);
 };
 
 /**
  * Initiate a Me2Me connection.
  *
  * @param {remoting.Host} host The Me2Me host to which to connect.
- * @param {string} pin The PIN as entered by the user.
+ * @param {function(function(string):void):void} fetchPin Function to
+ *     interactively obtain the PIN from the user.
  * @return {void} Nothing.
  */
-remoting.SessionConnector.prototype.connectMe2Me = function(host, pin) {
+remoting.SessionConnector.prototype.connectMe2Me = function(host, fetchPin) {
   this.hostId_ = host.hostId;
   this.hostJid_ = host.jabberId;
-  this.passPhrase_ = pin;
+  this.fetchPin_ = fetchPin;
   this.hostDisplayName_ = host.hostName;
   this.createSessionIfReady_();
 };
 
 /**
  * Initiate an IT2Me connection.
  *
  * @param {string} accessCode The access code as entered by the user.
  * @return {void} Nothing.
  */
@@ skipping 118 matching lines @@
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnector.prototype.createSessionIfReady_ = function() {
   if (!this.clientJid_ || !this.hostJid_) {
     return;
   }
 
   var securityTypes = 'spake2_hmac,spake2_plain';
   this.clientSession_ = new remoting.ClientSession(
-      this.hostJid_, this.clientJid_, this.hostPublicKey_,
-      this.passPhrase_, securityTypes, this.hostId_,
-      this.connectionMode_, this.hostDisplayName_);
+      this.hostJid_, this.clientJid_, this.hostPublicKey_, this.passPhrase_,
+      this.fetchPin_, securityTypes, this.hostId_, this.connectionMode_,
+      this.hostDisplayName_);
   this.clientSession_.logHostOfflineErrors(!this.refreshHostJidIfOffline_);
   this.clientSession_.setOnStateChange(this.onStateChange_.bind(this));
   this.clientSession_.createPluginAndConnect(this.pluginParent_);
 };
 
 /**
  * Handle a change in the state of the client session prior to successful
  * connection (after connection, this class no longer handles state change
  * events). Errors that occur while connecting either trigger a reconnect
  * or notify the onError handler.
@@ skipping 69 matching lines @@
 
 /**
  * @param {boolean} success True if the host list was successfully refreshed;
  *     false if an error occurred.
  * @private
  */
 remoting.SessionConnector.prototype.onHostListRefresh_ = function(success) {
   if (success) {
     var host = remoting.hostList.getHostForId(this.hostId_);
     if (host) {
-      this.connectMe2Me(host, this.passPhrase_);
+      this.connectMe2Me(host, this.fetchPin_);
       return;
     }
   }
   this.onError_(remoting.Error.HOST_IS_OFFLINE);
 };
 
 /**
  * Start a timer to periodically refresh the access token used by WCS. Access
  * tokens have a limited lifespan, and since the WCS driver runs in a sandbox,
  * it can't obtain a new one directly.
@@ skipping 42 matching lines @@
 /**
  * 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).
  */
 remoting.SessionConnector.prototype.normalizeAccessCode_ =
     function(accessCode) {
   // Trim whitespace.
   return accessCode.replace(/\s/g, '');
-};
+};