Bug 957426 - Update Sync Options for Firefox Accounts. r=rnewman

browser/components/preferences/sync.js

@@ -8,6 +8,17 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 const PAGE_NO_ACCOUNT = 0;
 const PAGE_HAS_ACCOUNT = 1;
 const PAGE_NEEDS_UPDATE = 2;
+const PAGE_PLEASE_WAIT = 3;
+const FXA_PAGE_LOGGED_OUT = 4;
+const FXA_PAGE_LOGGED_IN = 5;
+
+// Indexes into the "login status" deck.
+// We are in a successful verified state - everything should work!
+const FXA_LOGIN_VERIFIED = 0;
+// We have logged in to an unverified account.
+const FXA_LOGIN_UNVERIFIED = 1;
+// We are logged in locally, but the server rejected our credentials.
+const FXA_LOGIN_FAILED = 2;
 
 let gSyncPane = {
   _stringBundle: null,
@@ -44,6 +55,10 @@ let gSyncPane = {
       return;
     }
 
+    // it may take some time before we can determine what provider to use
+    // and the state of that provider, so show the "please wait" page.
+    this.page = PAGE_PLEASE_WAIT;
+
     let onUnload = function () {
       window.removeEventListener("unload", onUnload, false);
       try {
@@ -88,16 +103,59 @@ let gSyncPane = {
   },
 
   updateWeavePrefs: function () {
-    if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
-        Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
+    let service = Components.classes["@mozilla.org/weave/service;1"]
+                  .getService(Components.interfaces.nsISupports)
+                  .wrappedJSObject;
+    // service.fxAccountsEnabled is false iff sync is already configured for
+    // the legacy provider.
+    if (service.fxAccountsEnabled) {
+      // determine the fxa status...
+      this.page = PAGE_PLEASE_WAIT;
+      Components.utils.import("resource://gre/modules/FxAccounts.jsm");
+      fxAccounts.getSignedInUser().then(data => {
+        if (!data) {
+          this.page = FXA_PAGE_LOGGED_OUT;
+          return;
+        }
+        this.page = FXA_PAGE_LOGGED_IN;
+        // We are logged in locally, but maybe we are in a state where the
+        // server rejected our credentials (eg, password changed on the server)
+        let fxaLoginStatus = document.getElementById("fxaLoginStatus");
+        let enginesListDisabled;
+        // Not Verfied implies login error state, so check that first.
+        if (!data.verified) {
+          fxaLoginStatus.selectedIndex = FXA_LOGIN_UNVERIFIED;
+          enginesListDisabled = true;
+        // So we think we are logged in, so login problems are next.
+        } else if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
+          fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
+          enginesListDisabled = true;
+        // Else we must be golden!
+        } else {
+          fxaLoginStatus.selectedIndex = FXA_LOGIN_VERIFIED;
+          enginesListDisabled = false;
+        }
+        document.getElementById("fxaEmailAddress1").textContent = data.email;
+        document.getElementById("fxaEmailAddress2").textContent = data.email;
+        document.getElementById("fxaEmailAddress3").textContent = data.email;
+        document.getElementById("fxaSyncComputerName").value = Weave.Service.clientsEngine.localName;
+        let enginesList = document.getElementById("fxaSyncEnginesList")
+        enginesList.disabled = enginesListDisabled;
+        // *sigh* - disabling the <richlistbox> draws each item as if it is disabled,
+        // but doesn't disable the checkboxes.
+        for (let checkbox of enginesList.querySelectorAll("checkbox")) {
+          checkbox.disabled = enginesListDisabled;
+        }
+      });
+    // If fxAccountEnabled is false and we are in a "not configured" state,
+    // then fxAccounts is probably fully disabled rather than just unconfigured,
+    // so handle this case.  This block can be removed once we remove support
+    // for fxAccounts being disabled.
+    } else if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
+               Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
       this.page = PAGE_NO_ACCOUNT;
-      let service = Components.classes["@mozilla.org/weave/service;1"]
-                    .getService(Components.interfaces.nsISupports)
-                    .wrappedJSObject;
-      // no concept of "pair" in an fxAccounts world.
-      if (service.fxAccountsEnabled) {
-        document.getElementById("pairDevice").hidden = true;
-      }
+    // else: sync was previously configured for the legacy provider, so we
+    // make the "old" panels available.
     } else if (Weave.Status.login == Weave.LOGIN_FAILED_INVALID_PASSPHRASE ||
                Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED) {
       this.needsUpdate();
@@ -163,10 +221,7 @@ let gSyncPane = {
                   .wrappedJSObject;
 
     if (service.fxAccountsEnabled) {
-      let win = Services.wm.getMostRecentWindow("navigator:browser");
-      win.switchToTabHavingURI("about:accounts", true);
-      // seeing as we are doing this in a tab we close the prefs dialog.
-      window.close();
+      this.openContentInBrowser("about:accounts");
     } else {
       let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
       if (win) {
@@ -179,6 +234,56 @@ let gSyncPane = {
     }
   },
 
+  openContentInBrowser: function(url) {
+    let win = Services.wm.getMostRecentWindow("navigator:browser");
+    if (!win) {
+      // no window to use, so use _openLink to create a new one.  We don't
+      // always use that as it prefers to open a new window rather than use
+      // an existing one.
+      gSyncUtils._openLink(url);
+      return;
+    }
+    win.switchToTabHavingURI(url, true);
+    // seeing as we are doing this in a tab we close the prefs dialog.
+    window.close();
+  },
+
+  reSignIn: function() {
+    this.openContentInBrowser("about:accounts");
+  },
+
+  manageFirefoxAccount: function() {
+    let url = Services.prefs.getCharPref("identity.fxaccounts.settings.uri");
+    this.openContentInBrowser(url);
+  },
+
+  verifyFirefoxAccount: function() {
+    Components.utils.import("resource://gre/modules/FxAccounts.jsm");
+    fxAccounts.resendVerificationEmail().then(() => {
+      fxAccounts.getSignedInUser().then(data => {
+        let sb = this._stringBundle;
+        let title = sb.GetStringFromName("firefoxAccountsVerificationSentTitle");
+        let heading = sb.formatStringFromName("firefoxAccountsVerificationSentHeading",
+                                              [data.email], 1);
+        let description = sb.GetStringFromName("firefoxAccountVerificationSentDescription");
+
+        Services.prompt.alert(window, title, heading + "\n\n" + description);
+      });
+    });
+  },
+
+  openOldSyncSupportPage: function() {
+    let url = Services.urlFormatter.formatURLPref('app.support.baseURL') + "old-sync"
+    this.openContentInBrowser(url);
+  },
+
+  unlinkFirefoxAccount: function(confirm) {
+    Components.utils.import('resource://gre/modules/FxAccounts.jsm');
+    fxAccounts.signOut().then(() => {
+      this.updateWeavePrefs();
+    });
+  },
+
   openQuotaDialog: function () {
     let win = Services.wm.getMostRecentWindow("Sync:ViewQuota");
     if (win) {

browser/components/preferences/sync.xul

@@ -38,6 +38,8 @@
 
 
       <deck id="weavePrefsDeck">
+
+        <!-- These panels are for the "legacy" sync provider -->
         <vbox id="noAccount" align="center">
           <spacer flex="1"/>
           <description id="syncDesc">
@@ -175,6 +177,137 @@
                  onclick="gSyncPane.startOver(true); return false;"
                  value="&unlinkDevice.label;"/>
         </vbox>
+
+        <!-- These panels are for the Firefox Accounts identity provider -->
+        <vbox id="fxaDeterminingStatus" align="center">
+          <spacer flex="1"/>
+          <p>&determiningStatus.label;</p>
+          <spacer flex="1"/>
+        </vbox>
+
+        <vbox id="noFxaAccount">
+          <description>&welcome.description;</description>
+          <label class="text-link"
+                 onclick="gSyncPane.openContentInBrowser('about:accounts?signin=true'); return false;"
+                 value="&welcome.startButton.label;"/>
+          <spacer flex="1"/>
+          <label class="text-link"
+                 onclick="gSyncPane.openOldSyncSupportPage(); return false;"
+                 value="&welcome.useOldSync.label;"/>
+          <spacer flex="10"/>
+        </vbox>
+
+        <vbox id="hasFxaAccount">
+          <groupbox id="fxaGroup">
+            <caption label="&syncBrand.fxa-singular.label;"/>
+
+            <deck id="fxaLoginStatus">
+
+              <!-- logged in and verified and all is good -->
+              <hbox flex="1">
+                <label id="fxaEmailAddress1"/>
+                <label class="text-link"
+                       onclick="gSyncPane.manageFirefoxAccount();"
+                       value="&manage.label;"/>
+                <spacer flex="1"/>
+                <vbox align="end">
+                  <button onclick="gSyncPane.unlinkFirefoxAccount(true);"
+                          label="&unlink.label;" />
+                </vbox>
+              </hbox>
+
+              <!-- logged in to an unverified account -->
+              <hbox flex="1">
+                <description>
+                  &signedInUnverified.beforename.label;
+                  <span id="fxaEmailAddress2"></span>
+                  &signedInUnverified.aftername.label;
+                </description>
+                <spacer flex="1"/>
+                <vbox align="end">
+                  <button onclick="gSyncPane.verifyFirefoxAccount();"
+                          caption="&verify.label;"/>
+                  <label class="text-link"
+                         onclick="/* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false);"
+                         value="&forget.label;"/>
+                </vbox>
+              </hbox>
+
+              <!-- logged in locally but server rejected credentials -->
+              <hbox flex="1">
+                <description>
+                  &signedInLoginFailure.beforename.label;
+                  <span id="fxaEmailAddress3"></span>
+                  &signedInLoginFailure.aftername.label;
+                </description>
+                <spacer flex="1"/>
+                <vbox align="end">
+                  <button onclick="gSyncPane.reSignIn();"
+                         label="&signIn.label;"/>
+                  <label class="text-link"
+                         onclick="gSyncPane.unlinkFirefoxAccount(true);"
+                         value="&forget.label;"/>
+                </vbox>
+              </hbox>
+            </deck>
+          </groupbox>
+
+          <groupbox id="syncOptions">
+            <caption label="&syncBrand.fullName.label;"/>
+            <vbox>
+              <label value="&syncMy.label;" />
+              <richlistbox id="fxaSyncEnginesList"
+                           orient="vertical"
+                           onselect="if (this.selectedCount) this.clearSelection();">
+                <richlistitem>
+                  <checkbox label="&engine.addons.label;"
+                            accesskey="&engine.addons.accesskey;"
+                            preference="engine.addons"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.bookmarks.label;"
+                            accesskey="&engine.bookmarks.accesskey;"
+                            preference="engine.bookmarks"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.passwords.label;"
+                            accesskey="&engine.passwords.accesskey;"
+                            preference="engine.passwords"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.prefs.label;"
+                            accesskey="&engine.prefs.accesskey;"
+                            preference="engine.prefs"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.history.label;"
+                            accesskey="&engine.history.accesskey;"
+                            preference="engine.history"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.tabs.label;"
+                            accesskey="&engine.tabs.accesskey;"
+                            preference="engine.tabs"/>
+                </richlistitem>
+              </richlistbox>
+            </vbox>
+          </groupbox>
+          <vbox>
+            <label value="&syncDeviceName.label;"
+                   accesskey="&syncDeviceName.accesskey;"
+                   control="syncComputerName"/>
+            <textbox id="fxaSyncComputerName"
+                     onchange="gSyncUtils.changeName(this)"/>
+          </vbox>
+          <hbox id="tosPP" pack="center">
+            <label class="text-link"
+                   onclick="event.stopPropagation();gSyncUtils.openToS();"
+                   value="&prefs.tosLink.label;"/>
+            <label class="text-link"
+                   onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();"
+                   value="&fxaPrivacyNotice.link.label;"/>
+          </hbox>
+        </vbox>
       </deck>
   </prefpane>
 </overlay>

browser/locales/en-US/chrome/browser/preferences/preferences.properties

@@ -135,3 +135,9 @@ syncUnlinkConfirm.label=Unlink
 featureEnableRequiresRestart=%S must restart to enable this feature.
 featureDisableRequiresRestart=%S must restart to disable this feature.
 shouldRestartTitle=Restart %S
+
+###Preferences::Sync::Firefox Accounts
+firefoxAccountsVerificationSentTitle=Verification Sent
+# LOCALIZATION NOTE: %S = user's email address.
+firefoxAccountsVerificationSentHeading=A verification link has been sent to %S
+firefoxAccountVerificationSentDescription=Please check your email and click the verification link to begin syncing.

browser/locales/en-US/chrome/browser/preferences/sync.dtd

@@ -45,3 +45,23 @@
 <!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Terms of Service">
 <!ENTITY prefs.ppLink.label         "Privacy Policy">
+
+<!-- Firefox Accounts stuff -->
+<!ENTITY fxaPrivacyNotice.link.label "Privacy Notice">
+<!ENTITY determiningStatus.label    "Determining your Firefox Account status…">
+<!ENTITY signedInUnverified.beforename.label "">
+<!ENTITY signedInUnverified.aftername.label "is not verified.">
+
+<!ENTITY signedInLoginFailure.beforename.label "Please sign in to reconnect">
+<!ENTITY signedInLoginFailure.aftername.label "">
+
+<!ENTITY notSignedIn.label           "You are not signed in.">
+<!ENTITY signIn.label                "Sign in">
+<!ENTITY manage.label                "Manage">
+<!ENTITY unlink.label                "Unlink This Browser…">
+<!ENTITY verify.label                "Verify Email">
+<!ENTITY forget.label                "Forget this Email">
+
+<!ENTITY welcome.description "Access your tabs, bookmarks, passwords and more wherever you use &brandShortName;.">
+<!ENTITY welcome.startButton.label "Sign in or Create an Account">
+<!ENTITY welcome.useOldSync.label "Using an older version of Sync?">

browser/locales/en-US/chrome/browser/syncBrand.dtd

@@ -4,3 +4,5 @@
 
 <!ENTITY syncBrand.shortName.label  "Sync">
 <!ENTITY syncBrand.fullName.label   "Firefox Sync">
+<!ENTITY syncBrand.fxa-singular.label "Firefox Account">
+<!ENTITY syncBrand.fxa-plural.label "Firefox Accounts">