Use the local user's email when connecting to It2MeHelpeeChannel

remoting/webapp/crd/js/it2me_helpee_channel.js

 // Copyright 2014 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
  *
  * It2MeHelpeeChannel relays messages between the Hangouts web page (Hangouts)
  * and the It2Me Native Messaging Host (It2MeHost) for the helpee (the Hangouts
  * participant who is receiving remoting assistance).
@@ skipping 231 matching lines @@
 };
 
 /**
  * Connects to the It2Me Native messaging Host and retrieves the access code.
  *
  * @param {{method:string, data:Object.<string,*>}} message
  * @private
  */
 remoting.It2MeHelpeeChannel.prototype.handleConnect_ =
     function(message) {
-  var email = getStringAttr(message, 'email');
   var bounds =
       /** @type {Bounds} */ (getObjectAttr(message, 'hangoutBounds', null));
 
-  if (!email) {
-    throw new Error('Missing required parameter: email');
-  }
-
   if (this.hostState_ !== remoting.HostSession.State.UNKNOWN) {
     throw new Error('An existing connection is in progress.');
   }
 
   var that = this;
-  this.showConfirmDialog_(bounds).then(
-    this.initializeHost_.bind(this)
-  ).then(
-    this.fetchOAuthToken_.bind(this)
-  ).then(
-    /** @type {function(*):void} */(this.connectToHost_.bind(this, email))
-  ).catch(
-    /** @param {*} reason */
-    function(reason) {
-      var error = /** @type {Error} */ (reason);
-      that.sendErrorResponse_(message, error);
-      that.dispose();
-    }
-  );
+  this.showConfirmDialog_(bounds)
+      .then(this.initializeHost_.bind(this))
+      .then(this.fetchOAuthToken_.bind(this))
+      .then(this.fetchEmail_.bind(this))
+      /** @param {{email:string, token:string}|Promise} result */

[kelvinp, 2015/02/03 23:11:09]

(| Promise) is there to make JSCompile happy as it incorrectly believes that all
functions in the then handler should be a promise.

+      .then(function(result) {
+        return that.connectToHost_(result.email, result.token);

[dcaiafa, 2015/02/04 00:12:35]

I'm confused. connectToHost_ doesn't return anything. Do you expect it to return
a Promise?

[kelvinp, 2015/02/04 00:38:14]

Done.

+      /** @param {*} reason */
+      }).catch(function(reason) {
+        that.sendErrorResponse_(message, /** @type {Error} */ (reason));
+        that.dispose();
+      });
 };
 
 /**
  * Prompts the user before starting the It2Me Native Messaging Host.  This
  * ensures that even if Hangouts is compromised, an attacker cannot start the
  * host without explicit user confirmation.
  *
  * @param {Bounds} bounds Bounds of the hangout window
  * @return {Promise} A promise that will resolve if the user accepts remote
  *   assistance or reject otherwise.
@@ skipping 72 matching lines @@
 };
 
 /**
  * @return {Promise<string>} Promise that resolves with the OAuth token as the
  * value.
  */
 remoting.It2MeHelpeeChannel.prototype.fetchOAuthToken_ = function() {
   if (base.isAppsV2()) {
     /**
      * @param {function(*=):void} resolve
+     * @param {function(*=):void} reject
      */
-    return new Promise(function(resolve){
-      chrome.identity.getAuthToken({'interactive': true}, resolve);
+    return new Promise(function(resolve, reject){
+      remoting.identity.callWithToken(resolve, reject);
     });
   } else {
     /**
      * @param {function(*=):void} resolve
      * @param {function(*=):void} reject
      */
     return new Promise(function(resolve, reject) {
-      /** @type {remoting.OAuth2} */
-      var oauth2 = new remoting.OAuth2();
       /** @param {remoting.Error} error */
       var onError = function(error) {
         if (error === remoting.Error.NOT_AUTHENTICATED) {
-          oauth2.doAuthRedirect(function() {
-            oauth2.callWithToken(resolve, reject);
+          remoting.oauth2.doAuthRedirect(function() {
+            remoting.identity.callWithToken(resolve, reject);
           });
           return;
         }
         reject(new Error(remoting.Error.NOT_AUTHENTICATED));
       };
-      oauth2.callWithToken(resolve, onError);
+      remoting.identity.callWithToken(resolve, onError);
     });
   }
 };
 
 /**
+ * @param {string|Promise} token

[kelvinp, 2015/02/03 23:11:09]

(| Promise) is there to make JSCompile happy as it incorrectly believes that all
functions in the then handler should be a promise.

+ * @return {Promise} Promise that resolves with the access token and the email
+ *   of the user.
+ */
+remoting.It2MeHelpeeChannel.prototype.fetchEmail_ = function(token) {
+  /**
+   * @param {function(*=):void} resolve
+   * @param {function(*=):void} reject
+   */
+  return new Promise(function(resolve, reject){
+    /** @param {string} email */
+    function onEmail (email) {
+      resolve({ email: email, token: token });
+    }
+    remoting.identity.getEmail(onEmail, reject);
+  });
+};
+
+/**
  * Connects to the It2Me Native Messaging Host and retrieves the access code
  * in the |onHostStateChanged_| callback.
  *
  * @param {string} email
  * @param {string} accessToken
  * @private
  */
 remoting.It2MeHelpeeChannel.prototype.connectToHost_ =
     function(email, accessToken) {
   base.debug.assert(this.host_.initialized());
@@ skipping 65 matching lines @@
 
   console.error('Error responding to message method:' +
                 (incomingMessage ? incomingMessage.method : 'null') +
                 ' error:' + error);
   this.hangoutPort_.postMessage({
     method: remoting.It2MeHelpeeChannel.HangoutMessageTypes.ERROR,
     message: error,
     request: incomingMessage
   });
 };