Updated remoting.xhr API to use promises. Removed access to the native

remoting/webapp/crd/js/it2me_connect_flow.js

 // Copyright 2015 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.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 (function() {
 
 'use strict';
@@ skipping 36 matching lines @@
  *     Rejects with remoting.Error on failure.
  * @private
  */
 remoting.It2MeConnectFlow.prototype.connect_ = function(accessCode) {
   var that = this;
 
   return this.verifyAccessCode_(accessCode).then(function() {
     return remoting.identity.getToken();
   }).then(function(/** string */ token) {
     return that.getHostInfo_(token);
   }).then(function(/** XMLHttpRequest */ xhr) {

[kelvinp, 2015/03/17 01:32:46]

You need to fix that as well.

[John Williams, 2015/03/17 17:39:38]

God bless JSCompiler and its rigorous type system.  This is why I'm teaching
myself Haskell.

     return that.onHostInfo_(xhr);
   }).then(function(/** remoting.Host */ host) {
     that.sessionConnector_.connect(
         remoting.DesktopConnectedView.Mode.IT2ME,
         host,
         new remoting.CredentialsProvider({ accessCode: that.passCode_ }));
   }).catch(function(error) {
     return Promise.reject(/** remoting.Error */ error);
   });
 };
@@ skipping 13 matching lines @@
   this.hostId_ = normalizedAccessCode.substring(0, SUPPORT_ID_LENGTH);
   this.passCode_ = normalizedAccessCode;
 
   return Promise.resolve();
 };
 
 /**
  * Continues an IT2Me connection once an access token has been obtained.
  *
  * @param {string} token An OAuth2 access token.
- * @return {Promise<XMLHttpRequest>}
+ * @return {Promise<remoting.Xhr.Response>}
  * @private
  */
 remoting.It2MeConnectFlow.prototype.getHostInfo_ = function(token) {
   var that = this;
-  return new Promise(function(resolve) {
-    remoting.xhr.start({
-      method: 'GET',
-      url: remoting.settings.DIRECTORY_API_BASE_URL + '/support-hosts/' +
-           encodeURIComponent(that.hostId_),
-      onDone: resolve,
-      oauthToken: token
-    });
-  });
+  return new remoting.Xhr({
+    method: 'GET',
+    url: remoting.settings.DIRECTORY_API_BASE_URL + '/support-hosts/' +
+        encodeURIComponent(that.hostId_),
+    oauthToken: token
+  }).start();
 };
 
 /**
  * Continues an IT2Me connection once the host JID has been looked up.
  *
  * @param {XMLHttpRequest} xhr The server response to the support-hosts query.
  * @return {!Promise<!remoting.Host>} Rejects on error.
  * @private
  */
 remoting.It2MeConnectFlow.prototype.onHostInfo_ = function(xhr) {

[kelvinp, 2015/03/17 01:32:46]

This needed to be updated as well.

[John Williams, 2015/03/17 17:39:38]

Done.

[kelvinp, 2015/03/17 22:06:20]

I don't think it is done yet, probably need
s/XMLHttpRequest/remoting.Xhr.Response right?

[John Williams, 2015/03/18 20:07:23]

Done.

   if (xhr.status == 200) {
     var response = /** @type {{data: {jabberId: string, publicKey: string}}} */
         (base.jsonParseSafe(xhr.responseText));
     if (response && response.data &&
         response.data.jabberId && response.data.publicKey) {
       var host = new remoting.Host();
       host.hostId = this.hostId_;
       host.jabberId = response.data.jabberId;
       host.publicKey = response.data.publicKey;
       host.hostName = response.data.jabberId.split('/')[0];
@@ skipping 16 matching lines @@
   switch (error) {
     case 0: return new remoting.Error(remoting.Error.Tag.NETWORK_FAILURE);
     case 404: return new remoting.Error(remoting.Error.Tag.INVALID_ACCESS_CODE);
     case 502: // No break
     case 503: return new remoting.Error(remoting.Error.Tag.SERVICE_UNAVAILABLE);
     default: return remoting.Error.unexpected();
   }
 }
 
 })();