Changed identity API to use promises instead of callbacks.

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 336 matching lines @@
     if (host.initialized()) {
       resolve(true);
     } else {
       host.initialize(/** @type {function(*=):void} */ (resolve),
                       /** @type {function(*=):void} */ (reject));
     }
   });
 };
 
 /**
- * @return {Promise<string>} Promise that resolves with the OAuth token as the
+ * @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, reject){
-      remoting.identity.callWithToken(resolve, reject);
-    });
+    return remoting.identity.getToken();
   } else {
-    /**
-     * @param {function(*=):void} resolve
-     * @param {function(*=):void} reject
-     */
-    return new Promise(function(resolve, reject) {
-      /** @param {remoting.Error} error */
-      var onError = function(error) {
+      var onError = function(/** * */ error) {
         if (error === remoting.Error.NOT_AUTHENTICATED) {
-          remoting.oauth2.doAuthRedirect(function() {
-            remoting.identity.callWithToken(resolve, reject);
+          return new Promise(function(resolve, reject) {
+            remoting.oauth2.doAuthRedirect(function() {
+              remoting.identity.getToken().then(resolve);
+            });
           });
-          return;
         }
-        reject(new Error(remoting.Error.NOT_AUTHENTICATED));
+        throw Error(remoting.Error.NOT_AUTHENTICATED);
       };
-      remoting.identity.callWithToken(resolve, onError);
-    });
+    return /** @type {!Promise<string>} */ (
+        remoting.identity.getToken().catch(onError));
   }
 };
 
 /**
  * @param {string|Promise} token
  * @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);
-  });
+  /** @param {string} email */
+  function onEmail (email) {
+    return { email: email, token: token };
+  }
+  return remoting.identity.getEmail().then(onEmail);
 };
 
 /**
  * Connects to the It2Me Native Messaging Host and retrieves the access code
  * in the |onHostStateChanged_| callback.
  *
  * @param {string} email
  * @param {string} accessToken
  * @private
  */
@@ skipping 68 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
   });
 };