Fix comptability with Thunderbird 29.X (beta)

Related: https://bugzilla.mozilla.org/show_bug.cgi?id=884319#c6
gierschv · Apr 25, 2014 · 6109f5c · 6109f5c
1 parent 8b74f89
commit 6109f5c
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 51 deletions.
diff --git a/components/nsHubiC.js b/components/nsHubiC.js
@@ -14,8 +14,8 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/http.jsm");
-Cu.import("resource:///modules/gloda/log4moz.js");
+Cu.import("resource://gre/modules/Http.jsm");
+Cu.import("resource://app/modules/gloda/log4moz.js");
 Cu.import("resource:///modules/cloudFileAccounts.js");
 Cu.import("resource://hubiC/OAuth2.jsm");
 
@@ -155,10 +155,10 @@ nsHubiC.prototype = {
     }
   },
 
-  /** 
+  /**
    * Attempts to upload a file to hubiC.
    *
-   * @param aFile the nsILocalFile to be uploaded
+   * @param aFile the nsIFile to be uploaded
    * @param aCallback an nsIRequestObserver for listening for the starting
    *                  and ending states of the upload.
    */
@@ -200,7 +200,7 @@ nsHubiC.prototype = {
    * (we haven't exceeded file size or quota limitations), and then attempts
    * to kick-off the upload.
    *
-   * @param aFile the nsILocalFile to upload
+   * @param aFile the nsIFile to upload
    * @param aCallback an nsIRequestObserver for monitoring the starting and
    *                  ending states of the upload.
    */
@@ -229,7 +229,7 @@ nsHubiC.prototype = {
   /**
    * Attempts to cancel a file upload.
    *
-   * @param aFile the nsILocalFile to cancel the upload for.
+   * @param aFile the nsIFile to cancel the upload for.
    */
   cancelFileUpload: function nsHubiC_cancelFileUpload(aFile) {
     if (this._uploadingFile.equals(aFile)) {
@@ -248,16 +248,15 @@ nsHubiC.prototype = {
 
   _apiRequest: function nsHubiC_apiRequest(url, params, successCallback, failureCallback, method) {
     var doApiRequest = function () {
-      let headers = [
-        ["Authorization", "Bearer " + this._cachedAccessToken],
-        ["Accept", "application/json"]
-      ];
-
-      this.log.info('API Request: ', url, JSON.stringify(headers), JSON.stringify(params));
-      doXHRequest(
-        url, headers, params,
-        successCallback,
-        function (err, aResponseText) {
+      let options = {
+        method: method,
+        postData: params,
+        headers: [
+          ["Authorization", "Bearer " + this._cachedAccessToken],
+          ["Accept", "application/json"]
+        ],
+        onLoad: successCallback.bind(this),
+        onError: function (err, aResponseText) {
           let aResponse = JSON.parse(aResponseText);
           if (aResponse.error === 'invalid_token') {
             this._cachedAccessToken = null;
@@ -269,8 +268,11 @@ nsHubiC.prototype = {
             failureCallback(err, aResponseText);
           }
         }.bind(this),
-        this, method
-      );
+      };
+
+      this.log.info('API Request: ', url, JSON.stringify(options));
+
+      httpRequest(url, options);
     }.bind(this);
 
     var refreshCb = function () {
@@ -413,9 +415,9 @@ nsHubiC.prototype = {
   },
 
   /**
-   * For some nsILocalFile, return the associated sharing URL.
+   * For some nsIFile, return the associated sharing URL.
    *
-   * @param aFile the nsILocalFile to retrieve the URL for
+   * @param aFile the nsIFile to retrieve the URL for
    */
   urlForFile: function nsHubiC_urlForFile(aFile) {
     return this._urlsForFiles[aFile.path];
@@ -505,20 +507,21 @@ nsHubiC.prototype = {
    *                  ending states of the deletion request.
    */
   deleteFile: function nsHubiC_deleteFile(aFile, aCallback) {
-    if (Services.io.offline)
+    if (Services.io.offline) {
       throw Ci.nsIMsgCloudFileProvider.offlineErr;
+    }
 
     let fileHubic = this._uploadInfo[aFile.path];
-    if (!fileHubic)
+    if (!fileHubic) {
       throw Cr.NS_ERROR_FAILURE;
+    }
 
     this.requestObserver = aCallback;
 
-    let url = this._cachedSwiftEndpoint + kContainerPath + fileHubic.fileHubicEncoded;
-    let headers = [["X-Auth-Token", this._cachedSwiftToken]];
-
-    this.request = doXHRequest(url, headers, null,
-      function(aResponseText, aRequest) {
+    let options = {
+      method: "DELETE",
+      headers: [["X-Auth-Token", this._cachedSwiftToken]],
+      onLoad: function(aResponseText, aRequest) {
         this.request = null;
         this.log.info("success deleting file " + aResponseText);
 
@@ -528,11 +531,16 @@ nsHubiC.prototype = {
 
         this._deleteLink(fileHubic.fileHubic, deleteLink, deleteLink);
       }.bind(this),
-      function(aException, aResponseText, aRequest) {
+      onError: function(aException, aResponseText, aRequest) {
         this.request = null;
         this.log.info("failed deleting file response = " + aResponseText);
         aCallback.onStopRequest(null, null, Ci.nsIMsgCloudFileProvider.uploadErr);
-      }.bind(this), this, "DELETE"
+      }.bind(this),
+    };
+
+    this.request = httpRequest(
+      this._cachedSwiftEndpoint + kContainerPath + fileHubic.fileHubicEncoded,
+      options
     );
   },
 
@@ -573,7 +581,7 @@ nsHubiC.prototype = {
 
   get _cachedAccessToken() {
     let accessToken = cloudFileAccounts.getSecretValue(
-      this.accountKey, 
+      this.accountKey,
       cloudFileAccounts.kTokenRealm
     );
 
@@ -732,12 +740,15 @@ nsHubiCFileUploader.prototype = {
       }
       catch(e) { /* just use text/plain */ }
 
-      let headers = [["Content-Length", fstream.available()],
-                     ["Content-Type", mimeType],
-                     ["X-Auth-Token", this.hubic._cachedSwiftToken]];
-
-      this.request = doXHRequest(url, headers, bufStream,
-        function(aResponseText, aRequest) {
+      let options = {
+        method: "PUT",
+        postData: bufStream,
+        headers: [
+          ["Content-Length", fstream.available()],
+          ["Content-Type", mimeType],
+          ["X-Auth-Token", this.hubic._cachedSwiftToken]
+        ],
+        onLoad: function(aResponseText, aRequest) {
           this.request = null;
           this.log.info("Success putting file " + aResponseText);
           this.hubic._uploadInfo[this.file.path] = {
@@ -747,22 +758,24 @@ nsHubiCFileUploader.prototype = {
           this._getShareUrl.call(this.hubic, this.file, fileHubic,
                                  this.callback, this.requestObserver);
         }.bind(this),
-        function(aException, aResponseText, aRequest) {
+        onError: function(aException, aResponseText, aRequest) {
           this.request = null;
           this.log.info("Failed putting file response = " +
                         aRequest.status + " / " + aResponseText + " / " + aException);
           if (this.callback) {
             this.callback(this.requestObserver,
                           Ci.nsIMsgCloudFileProvider.uploadErr);
           }
-        }.bind(this), this, "PUT"
-      );
+        }.bind(this)
+      };
+
+      this.request = httpRequest(url, options);
     }.bind(this));
   },
 
   /**
    * Create upload directory if not exists
-   * It don't use doXHRequest to be able to overrideMimeType without charset
+   * It don't use httpRequest to be able to overrideMimeType without charset
    */
   createDirectory: function nsDFU_createDirectory(dir, callback) {
     this.log.info('createDirectory', dir);
@@ -830,15 +843,15 @@ nsHubiCFileUploader.prototype = {
    * Check if upload directory exists
    */
   directoryExists: function nsDFU_directoryExists(dir, callback) {
-    let headers = [["X-Auth-Token", this.hubic._cachedSwiftToken]];
-    let url = this.hubic._cachedSwiftEndpoint + kContainerPath + dir;
-    this.request = doXHRequest(url, headers, null,
-      function(aResponseText, aRequest) {
+    let options = {
+      method: 'HEAD',
+      headers: [["X-Auth-Token", this.hubic._cachedSwiftToken]],
+      onLoad: function(aResponseText, aRequest) {
         this.request = null;
         this.log.debug("Upload directory exists: " + dir);
         callback(dir, true);
       }.bind(this),
-      function(aException, aResponseText, aRequest) {
+      onError: function(aException, aResponseText, aRequest) {
         // Ensure token is still valid (should be since we check expiration date)
         if (aException.match(/401/)) {
           this.log.error('X-Auth-Token looks invalid, fetching new one');
@@ -851,7 +864,12 @@ nsHubiCFileUploader.prototype = {
         this.request = null;
         this.log.debug("Upload directory doesn't exist: " + dir, aException);
         callback(dir, false);
-      }.bind(this), this, "HEAD"
+      }.bind(this)
+    };
+
+    this.request = httpRequest(
+      this.hubic._cachedSwiftEndpoint + kContainerPath + dir,
+      options
     );
   },
 

diff --git a/install.rdf b/install.rdf
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. --><RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>thunderbird-filelink-hubic@vincent.sh</em:id>
-    <em:version>0.2.1</em:version>
+    <em:version>0.2.3</em:version>
     <em:type>2</em:type>
     <em:unpack>false</em:unpack>
 
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- Thunderbird -->
         <em:minVersion>13.*</em:minVersion>
-        <em:maxVersion>24.*</em:maxVersion>
+        <em:maxVersion>29.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

diff --git a/resources/OAuth2.jsm b/resources/OAuth2.jsm
@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["OAuth2"];
 
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
-Cu.import("resource:///modules/http.jsm");
+Cu.import("resource://gre/modules/Http.jsm");
 Cu.import("resource:///modules/Services.jsm");
 Cu.import("resource:///modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/gloda/log4moz.js");
@@ -88,8 +88,12 @@ OAuth2.prototype = {
             _active: true,
             iconURI: "",
             cancelled: function() {
-                if (!this._active)
+                if (!this._active) {
                     return;
+                }
+
+                this.account.finishAuthorizationRequest();
+                this.account.onAuthorizationFailed();
             },
 
             loaded: function (aWindow, aWebProgress) {
@@ -150,12 +154,18 @@ OAuth2.prototype = {
         this._browserRequest._listener._cleanUp();
       delete this._browserRequest;
     },
+
     onAuthorizationReceived: function(aData) {
       this.log.info("authorization received" + aData);
       let results = parseURLData(aData);
       this.requestAccessToken(results.code, OAuth2.CODE_AUTHORIZATION);
     },
 
+    onAuthorizationFailed: function() {
+        this.connecting = false;
+        this.connectFailureCallback();
+    },
+
     requestAccessToken: function requestAccessToken(aCode, aType) {
 
         let params = [
@@ -176,7 +186,14 @@ OAuth2.prototype = {
             ["Authorization", "Basic " + btoa(this.consumerKey + ':' + this.consumerSecret)]
         ];
 
-        doXHRequest(this.tokenURI, headers, params, this.onAccessTokenReceived, this.onAccessTokenFailed, this);
+        let options = {
+          postData: params,
+          headers: headers,
+          onLoad: this.onAccessTokenReceived.bind(this),
+          onError: this.onAccessTokenFailed.bind(this)
+        }
+
+        httpRequest(this.tokenURI, options);
     },
 
     onAccessTokenFailed: function onAccessTokenFailed(aData) {