Merge pull request #296 from mozilla/remove-hardcoded-tokenserver-url

Remove hardcoded preference identity.sync.tokenserver.uri

Author: gcp

browser/branding/enterprise/pref/firefox-enterprise.js

@@ -6,12 +6,6 @@
 
 pref("enterprise.console.address", "https://console.enterfox.eu");
 
-// Endpoint will be provided by the console.
-pref(
-  "identity.sync.tokenserver.uri",
-  "https://ent-dev-tokenserver.sync.nonprod.webservices.mozgcp.net/1.0/sync/1.5"
-);
-
 pref("browser.profiles.enabled", false);
 pref("extensions.activeThemeID", "firefox-enterprise-light@mozilla.org");
 

browser/extensions/felt/content/FeltProcessParent.sys.mjs

@@ -209,6 +209,8 @@ export class FeltProcessParent extends JSProcessActorParent {
       .then(async () => {
         this.sendPrefsToFirefox();
         Services.felt.sendTokens();
+
+        // Gets sync tokenserver uri from the console amongst other prefs
         const { prefs } = await lazy.ConsoleClient.getDefaultPrefs();
         prefs.forEach(pref => {
           const name = pref[0];

testing/enterprise/felt_tests.py

@@ -149,6 +149,10 @@ def do_GET(self):
                         ["browser.sessionstore.restore_on_demand", False],
                         ["browser.sessionstore.resume_from_crash", False],
                         ["browser.policies.live_polling.frequency", 500],
+                        [
+                            "identity.sync.tokenserver.uri",
+                            "https://ent-dev-tokenserver.sync.nonprod.webservices.mozgcp.net/1.0/sync/1.5",
+                        ],
                     ]
                 }
             )