[Pkg-mozext-commits] [gcontactsync] 16/31: Issue #59 - Handle deleted tokens

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 39517a9d36f47b9e7d93b0d2ad01a0317b573fbd
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Mon Dec 22 16:46:35 2014 -0600

    Issue #59 - Handle deleted tokens
---
 src/content/AccountSetupWizard.js    |  2 +-
 src/content/NewRefreshToken.xul      |  2 +-
 src/content/OAuth2.js                |  2 +-
 src/content/gdata.js                 | 11 ++++++++---
 src/locale/en-US/NewRefreshToken.dtd |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/content/AccountSetupWizard.js b/src/content/AccountSetupWizard.js
index d78d9cc..d8d5581 100644
--- a/src/content/AccountSetupWizard.js
+++ b/src/content/AccountSetupWizard.js
@@ -127,7 +127,7 @@ com.gContactSync.AccountSetupWizard = {
 
     var wizard = document.getElementById("newAccountWizard");
     var browser = document.getElementById("browser");
-    browser.setAttribute("src", com.gContactSync.gdata.getOAuthURL(this.mEmailAddress));
+    browser.loadURI(com.gContactSync.gdata.getOAuthURL(this.mEmailAddress));
     com.gContactSync.OAuth2.init(browser, com.gContactSync.gdata.REDIRECT_URI, this.onSuccessfulAuthentication);
     wizard.canAdvance = false;
   },
diff --git a/src/content/NewRefreshToken.xul b/src/content/NewRefreshToken.xul
index cb281eb..557eb34 100644
--- a/src/content/NewRefreshToken.xul
+++ b/src/content/NewRefreshToken.xul
@@ -44,6 +44,6 @@
         height="740px"
         width="700px">
   <hbox flex="1">
-    <browser id="browser" src="" flex="1"/>
+    <browser id="browser" src="" flex="1" type="content"/>
   </hbox>
 </window>
diff --git a/src/content/OAuth2.js b/src/content/OAuth2.js
index 43c04a4..abf04e1 100644
--- a/src/content/OAuth2.js
+++ b/src/content/OAuth2.js
@@ -67,7 +67,7 @@ com.gContactSync.OAuth2 = {
   onCodeReceived: function OAuth2_onCodeReceived(aCode) {
     com.gContactSync.LOGGER.LOG("Received an authorization code");
     this.mBrowserElem.removeProgressListener(com.gContactSync.OAuth2.mListener);
-    this.mBrowserElem.setAttribute("src", "");
+    this.mBrowserElem.loadURI("");
     var request = new com.gContactSync.GHttpRequest("TOKEN_REQUEST", aCode);
     request.mOnSuccess = com.gContactSync.OAuth2.onTokenReceived;
     request.mOnError = function onTokenError(aHttpReq) {
diff --git a/src/content/gdata.js b/src/content/gdata.js
index 77179e4..63f221b 100644
--- a/src/content/gdata.js
+++ b/src/content/gdata.js
@@ -456,18 +456,23 @@ com.gContactSync.gdata = {
                                 aAccount + "\nto:\n" + destFile.path);
     return com.gContactSync.FileIO.writeToFile(destFile, aFeed);
   },
+  /**
+   * Requests a new refresh token.
+   * @param aEmail {string} The email address to request a token for.
+   * @param aCallback {function} The function to call once there is a new token.
+   */
   requestNewRefreshToken: function gdata_requestNewRefreshToken(aEmail, aCallback) {
     var wizard = window.open("chrome://gcontactsync/content/NewRefreshToken.xul",
                              "NewRefreshTokenWindow",
                              "chrome,resizable=yes,scrollbars=no,status=no");
     // when the setup window loads, set its onunload property to begin a sync
-    wizard.onload = function onloadListener() {
+    wizard.addEventListener("load", function onloadListener() {
       var browser = wizard.document.getElementById("browser");
+      browser.loadURI(com.gContactSync.gdata.getOAuthURL(aEmail));
       com.gContactSync.OAuth2.init(browser, com.gContactSync.gdata.REDIRECT_URI, function callback(aResponse) {
         wizard.close();
         aCallback(aResponse);
       });
-      browser.setAttribute("src", com.gContactSync.gdata.getOAuthURL(aEmail));
-    };
+    });
   },
 };
diff --git a/src/locale/en-US/NewRefreshToken.dtd b/src/locale/en-US/NewRefreshToken.dtd
index 5b099f2..2d1b36a 100644
--- a/src/locale/en-US/NewRefreshToken.dtd
+++ b/src/locale/en-US/NewRefreshToken.dtd
@@ -1 +1 @@
-<!ENTITY NewRefreshToken.title "Refresh Token">
+<!ENTITY NewRefreshToken.title "gContactSync Refresh Token">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git