Backed out changeset ebcab57cf7cd (bug 1883682) for causing newtab failures. CLOSED TREE

Author: ncsoregi

browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs

@@ -565,8 +565,8 @@ export class DiscoveryStreamFeed {
 
   generateFeedUrl(isBff) {
     if (isBff) {
-      return `https://${Services.prefs.getStringPref(
-        "extensions.pocket.bffApi"
+      return `https://${lazy.NimbusFeatures.saveToPocket.getVariable(
+        "bffApi"
       )}/desktop/v1/recommendations?locale=$locale&region=$region&count=30`;
     }
     return FEED_URL;
@@ -1324,8 +1324,8 @@ export class DiscoveryStreamFeed {
       let options = {};
       if (this.isBff) {
         const headers = new Headers();
-        const oAuthConsumerKey = Services.prefs.getStringPref(
-          "extensions.pocket.oAuthConsumerKeyBff"
+        const oAuthConsumerKey = lazy.NimbusFeatures.saveToPocket.getVariable(
+          "oAuthConsumerKeyBff"
         );
         headers.append("consumer_key", oAuthConsumerKey);
         options = {

browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js

@@ -3444,13 +3444,16 @@ describe("DiscoveryStreamFeed", () => {
         },
       });
       sandbox.stub(global.Region, "home").get(() => "DE");
-      global
-        .stub(global.Services.prefs, "getStringPref")
-        .withArgs("extensions.pocket.bffApi")
-        .returns("bffAPi");
-      global
-        .stub(global.Services.prefs, "getStringPref")
-        .withArgs("extensions.pocket.oAuthConsumerKeyBff")
+      globals.set("NimbusFeatures", {
+        saveToPocket: {
+          getVariable: sandbox.stub(),
+        },
+      });
+      global.NimbusFeatures.saveToPocket.getVariable
+        .withArgs("bffApi")
+        .returns("bffApi");
+      global.NimbusFeatures.saveToPocket.getVariable
+        .withArgs("oAuthConsumerKeyBff")
         .returns("oAuthConsumerKeyBff");
     });
     it("should return true with isBff", async () => {

browser/components/pocket/content/pktApi.sys.mjs

@@ -47,6 +47,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
 });
 
@@ -290,12 +291,12 @@ export var pktApi = (function () {
         "extensions.pocket.oAuthConsumerKey"
       );
     } else {
-      baseAPIUrl = `https://${Services.prefs.getStringPref(
-        "extensions.pocket.bffApi"
+      baseAPIUrl = `https://${lazy.NimbusFeatures.saveToPocket.getVariable(
+        "bffApi"
       )}/desktop/v1`;
 
-      oAuthConsumerKey = Services.prefs.getStringPref(
-        "extensions.pocket.oAuthConsumerKeyBff"
+      oAuthConsumerKey = lazy.NimbusFeatures.saveToPocket.getVariable(
+        "oAuthConsumerKeyBff"
       );
     }
 
@@ -760,9 +761,8 @@ export var pktApi = (function () {
       access_token: getAccessToken(),
     });
 
-    const useBFF = Services.prefs.getBoolPref(
-      "extensions.pocket.bffRecentSaves"
-    );
+    const useBFF =
+      lazy.NimbusFeatures.saveToPocket.getVariable("bffRecentSaves");
 
     return apiRequest(
       {
@@ -816,9 +816,8 @@ export var pktApi = (function () {
       { count: 4 },
       {
         success(data) {
-          const useBFF = Services.prefs.getBoolPref(
-            "extensions.pocket.bffRecentSaves"
-          );
+          const useBFF =
+            lazy.NimbusFeatures.saveToPocket.getVariable("bffRecentSaves");
 
           // Don't try to parse bad or missing data
           if (

browser/components/pocket/content/pktUI.js

@@ -46,6 +46,7 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
+  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   pktApi: "chrome://pocket/content/pktApi.sys.mjs",
   pktTelemetry: "chrome://pocket/content/pktTelemetry.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
@@ -128,9 +129,7 @@ var pktUI = (function () {
       showPanel(
         "about:pocket-signup?" +
           "emailButton=" +
-          Services.prefs.getBoolPref(
-            "extensions.pocket.refresh.emailButton.enabled"
-          ),
+          NimbusFeatures.saveToPocket.getVariable("emailButton"),
         `signup`
       );
     });
@@ -155,9 +154,8 @@ var pktUI = (function () {
    * Show the Pocket home panel state
    */
   function showPocketHome() {
-    const hideRecentSaves = Services.prefs.getBoolPref(
-      "extensions.pocket.refresh.hideRecentSaves.enabled"
-    );
+    const hideRecentSaves =
+      NimbusFeatures.saveToPocket.getVariable("hideRecentSaves");
     const locale = getUILocale();
     let panel = `home_no_topics`;
     if (locale.startsWith("en-")) {
@@ -234,11 +232,7 @@ var pktUI = (function () {
   async function onShowHome() {
     pktTelemetry.submitPocketButtonPing("click", "home_button");
 
-    if (
-      !Services.prefs.getBoolPref(
-        "extensions.pocket.refresh.hideRecentSaves.enabled"
-      )
-    ) {
+    if (!NimbusFeatures.saveToPocket.getVariable("hideRecentSaves")) {
       let recentSaves = await pktApi.getRecentSavesCache();
       if (recentSaves) {
         // We have cache, so we can use those.
@@ -305,11 +299,7 @@ var pktUI = (function () {
         pktUIMessaging.sendMessageToPanel(saveLinkMessageId, successResponse);
         SaveToPocket.itemSaved();
 
-        if (
-          !Services.prefs.getBoolPref(
-            "extensions.pocket.refresh.hideRecentSaves.enabled"
-          )
-        ) {
+        if (!NimbusFeatures.saveToPocket.getVariable("hideRecentSaves")) {
           // Articles saved for the first time (by anyone) won't have a resolved_id
           if (item?.resolved_id && item?.resolved_id !== "0") {
             pktApi.getArticleInfo(item.resolved_url, {

toolkit/components/nimbus/FeatureManifest.yaml

@@ -915,36 +915,27 @@ saveToPocket:
   description: The save to Pocket feature
   owner: sdowne@getpocket.com
   hasExposure: false
+  isEarlyStartup: true
   variables:
     emailButton:
       type: boolean
-      setPref:
-        branch: user
-        pref: extensions.pocket.refresh.emailButton.enabled
+      fallbackPref: extensions.pocket.refresh.emailButton.enabled
       description: Just for the new Pocket panels, enables the email signup button.
     hideRecentSaves:
       type: boolean
-      setPref:
-        branch: user
-        pref: extensions.pocket.refresh.hideRecentSaves.enabled
+      fallbackPref: extensions.pocket.refresh.hideRecentSaves.enabled
       description: Hides the recently saved section in the home panel.
     bffRecentSaves:
       type: boolean
-      setPref:
-        branch: user
-        pref: extensions.pocket.bffRecentSaves
+      fallbackPref: "extensions.pocket.bffRecentSaves"
       description: Use the new BFF Proxy Service instead of the legacy Pocket Service for Recent Saves
     bffApi:
       type: string
-      setPref:
-        branch: user
-        pref: extensions.pocket.bffApi
+      fallbackPref: "extensions.pocket.bffApi"
       description: BFF Proxy Service domain
     oAuthConsumerKeyBff:
       type: string
-      setPref:
-        branch: user
-        pref: extensions.pocket.oAuthConsumerKeyBff
+      fallbackPref: "extensions.pocket.oAuthConsumerKeyBff"
       description: BFF Proxy Service OAuth Consumer Key
 
 password-autocomplete:

toolkit/components/nimbus/generate/generate_feature_manifest.py

@@ -31,6 +31,7 @@
     "majorRelease2022",
     "newtab",
     "pocketNewtab",
+    "saveToPocket",
     "searchConfiguration",
     "shellService",
     "testFeature",