Bug 1903658 - enable identity.fxaccounts.oauth.enabled pref by default. r=jonalmeida,fxview-reviewers,omc-reviewers,aminomancer,nsharpley,joschmidt,credential-management-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D228899

browser/app/profile/firefox.js

@@ -2068,10 +2068,10 @@ pref("identity.fxaccounts.enabled", true);
 pref("identity.fxaccounts.remote.root", "https://accounts.firefox.com/");
 
 // The value of the context query parameter passed in fxa requests.
-pref("identity.fxaccounts.contextParam", "fx_desktop_v3");
+pref("identity.fxaccounts.contextParam", "oauth_webchannel_v1");
 
 // Whether to use the oauth flow for desktop or not
-pref("identity.fxaccounts.oauth.enabled", false);
+pref("identity.fxaccounts.oauth.enabled", true);
 
 // The remote URL of the FxA Profile Server
 pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");

browser/components/customizableui/test/browser_synced_tabs_menu.js

@@ -227,10 +227,12 @@ add_task(async function () {
   );
   await shown;
 
-  let expectedUrl =
+  let promiseTabOpened = BrowserTestUtils.waitForNewTab(
-    "https://example.com/connect_another_device?context=" +
+    gBrowser,
-    "fx_desktop_v3&entrypoint=synced-tabs&service=sync&uid=uid&email=foo%40bar.com";
+    url =>
-  let promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, expectedUrl);
+      url.startsWith("https://example.com/connect_another_device") &&
+      url.includes("entrypoint=synced-tabs")
+  );
   button.click();
   // the panel should have been closed.
   ok(!isOverflowOpen(), "click closed the panel");

browser/components/firefoxview/tests/browser/browser_syncedtabs_firefoxview.js

@@ -2,9 +2,11 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 add_setup(async function () {
+  Services.prefs.setBoolPref("identity.fxaccounts.oauth.enabled", false);
   registerCleanupFunction(() => {
     // reset internal state so it doesn't affect the next tests
     TabsSetupFlowManager.resetInternalState();
+    Services.prefs.clearUserPref("identity.fxaccounts.oauth.enabled");
   });
 
   // gSync.init() is called in a requestIdleCallback. Force its initialization.

browser/components/uitour/test/browser_UITour_sync.js

@@ -8,9 +8,17 @@ const MOCK_FLOW_ID =
 const MOCK_FLOW_BEGIN_TIME = 1590780440325;
 const MOCK_DEVICE_ID = "7e450f3337d3479b8582ea1c9bb5ba6c";
 
+Services.prefs.setBoolPref("identity.fxaccounts.oauth.enabled", false);
+Services.prefs.setStringPref(
+  "identity.fxaccounts.contextParam",
+  "fx_desktop_v3"
+);
+
 registerCleanupFunction(function () {
   Services.prefs.clearUserPref("identity.fxaccounts.remote.root");
   Services.prefs.clearUserPref("services.sync.username");
+  Services.prefs.clearUserPref("identity.fxaccounts.oauth.enabled");
+  Services.prefs.clearUserPref("identity.fxaccounts.contextParam");
 });
 
 add_task(setup_UITourTest);

services/fxaccounts/tests/xpcshell/test_accounts.js

@@ -392,6 +392,7 @@ add_test(function test_client_mock() {
 // Polling should detect that the email is verified, and eventually
 // 'onverified' should be observed
 add_test(function test_verification_poll() {
+  ensureOauthNotConfigured();
   let fxa = new MockFxAccounts();
   let test_user = getTestUser("francine");
   let login_notification_received = false;
@@ -436,6 +437,7 @@ add_test(function test_verification_poll() {
 // poll should time out.  No verifiedlogin event should be observed, and the
 // internal whenVerified promise should be rejected
 add_test(function test_polling_timeout() {
+  ensureOauthNotConfigured();
   // This test could be better - the onverified observer might fire on
   // somebody else's stack, and we're not making sure that we're not receiving
   // such a message. In other words, this tests either failure, or success, but
@@ -1010,6 +1012,7 @@ add_test(function test_fetchAndUnwrapAndDeriveKeys_no_token() {
 // signs in with a verified email.  Ensure that no sign-in events are triggered
 // on Alice's behalf.  In the end, Bob should be the signed-in user.
 add_test(function test_overlapping_signins() {
+  ensureOauthNotConfigured();
   let fxa = new MockFxAccounts();
   let alice = getTestUser("alice");
   let bob = getTestUser("bob");

services/fxaccounts/tests/xpcshell/test_accounts_device_registration.js

@@ -630,6 +630,7 @@ add_task(
   { skip_if: () => CLIENT_IS_THUNDERBIRD },
   async function test_verification_updates_registration() {
     const deviceName = "foo";
+    ensureOauthNotConfigured();
 
     const credentials = getTestUser("baz");
     const fxa = await MockFxAccounts(credentials, {

services/fxaccounts/tests/xpcshell/test_web_channel.js

@@ -692,6 +692,7 @@ add_task(async function test_helpers_login_with_customize_sync() {
 add_task(
   { skip_if: () => CLIENT_IS_THUNDERBIRD },
   async function test_helpers_login_with_customize_sync_and_declined_engines() {
+    ensureOauthNotConfigured();
     let configured = false;
     let helpers = new FxAccountsWebChannelHelpers({
       fxAccounts: {

services/sync/tests/unit/test_sync_auth_manager.js

@@ -729,6 +729,9 @@ add_task(async function test_getHAWKErrors() {
 
 add_task(async function test_getGetKeysFailing401() {
   _("SyncAuthManager correctly handles 401 responses fetching keys.");
+  if (Services.prefs.getBoolPref("identity.fxaccounts.oauth.enabled", false)) {
+    return;
+  }
 
   _("Arrange for a 401 - Sync should reflect an auth error.");
   let config = makeIdentityConfig();
@@ -752,6 +755,9 @@ add_task(async function test_getGetKeysFailing401() {
 
 add_task(async function test_getGetKeysFailing503() {
   _("SyncAuthManager correctly handles 5XX responses fetching keys.");
+  if (Services.prefs.getBoolPref("identity.fxaccounts.oauth.enabled", false)) {
+    return;
+  }
 
   _("Arrange for a 503 - Sync should reflect a network error.");
   let config = makeIdentityConfig();
@@ -781,6 +787,9 @@ add_task(async function test_getKeysMissing() {
   _(
     "SyncAuthManager correctly handles getKeyForScope succeeding but not returning the key."
   );
+  if (Services.prefs.getBoolPref("identity.fxaccounts.oauth.enabled", false)) {
+    return;
+  }
 
   let syncAuthManager = new SyncAuthManager();
   let identityConfig = makeIdentityConfig();
@@ -822,6 +831,10 @@ add_task(async function test_getKeysUnexpecedError() {
     "SyncAuthManager correctly handles getKeyForScope throwing an unexpected error."
   );
 
+  if (Services.prefs.getBoolPref("identity.fxaccounts.oauth.enabled", false)) {
+    return;
+  }
+
   let syncAuthManager = new SyncAuthManager();
   let identityConfig = makeIdentityConfig();
   // our mock identity config already has scopedKeys - remove them or we never

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js

@@ -11,9 +11,8 @@ add_task(async function test_SHOW_FIREFOX_ACCOUNTS() {
       type: "SHOW_FIREFOX_ACCOUNTS",
       data: { entrypoint: "snippets" },
     });
-    Assert.equal(
+    Assert.ok(
-      await loaded,
+      (await loaded).includes("entrypoint=snippets"),
-      "https://example.com/?context=fx_desktop_v3&entrypoint=snippets&action=email&service=sync",
       "should load fxa with endpoint=snippets"
     );
 
@@ -24,9 +23,8 @@ add_task(async function test_SHOW_FIREFOX_ACCOUNTS() {
       data: { entrypoint: "aboutwelcome" },
     });
 
-    Assert.equal(
+    Assert.ok(
-      await loaded,
+      (await loaded).includes("entrypoint=aboutwelcome"),
-      "https://example.com/?context=fx_desktop_v3&entrypoint=aboutwelcome&action=email&service=sync",
       "should load fxa with a custom endpoint"
     );
 
@@ -37,10 +35,12 @@ add_task(async function test_SHOW_FIREFOX_ACCOUNTS() {
       data: { entrypoint: "test", extraParams: { foo: "bar" } },
     });
 
-    Assert.equal(
+    let url = await loaded;
-      await loaded,
+    Assert.ok(
-      "https://example.com/?context=fx_desktop_v3&entrypoint=test&action=email&service=sync&foo=bar",
+      url.includes("entrypoint=test") &&
-      "should load fxa with a custom endpoint and extra parameters in url"
+        url.includes("foo=bar") &&
+        url.includes("service=sync"),
+      "should have correct url params"
     );
   });
 
@@ -55,7 +55,10 @@ add_task(async function test_SHOW_FIREFOX_ACCOUNTS() {
     };
     const tabPromise = BrowserTestUtils.waitForNewTab(
       gBrowser,
-      "https://example.com/?context=fx_desktop_v3&entrypoint=activity-stream-firstrun&action=email&service=sync"
+      url =>
+        url.startsWith("https://example.com") &&
+        url.includes("entrypoint=activity-stream-firstrun") &&
+        url.includes("service=sync")
     );
 
     await SpecialMessageActions.handleAction(action, gBrowser);

toolkit/components/passwordmgr/test/browser/browser_relay_signup_flow_showToAllBrowsers.js

@@ -7,7 +7,11 @@ Services.scriptloader.loadSubScript(
 
 add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
-    set: [["signon.firefoxRelay.showToAllBrowsers", true]],
+    set: [
+      ["signon.firefoxRelay.showToAllBrowsers", true],
+      ["identity.fxaccounts.oauth.enabled", false],
+      ["identity.fxaccounts.contextParam", "fx_desktop_v3"],
+    ],
   });
 });