Added the Refresh All button to invalidate caches and force requests to be sent again

dist/firefox/background.js

@@ -15,6 +15,7 @@ function createMessageTypes() {
     requestCustomerServiceRequest: "opportunitiesExtension.requestCustomerServiceRequest",
     requestWlActions: "opportunitiesExtension.requestWlActions",
     requestCurrentUser: "opportunitiesExtension.requestCurrentUser",
+    invalidateProductsCache: "opportunitiesExtension.invalidateProductsCache",
     requestConsumptionTrend: "opportunitiesExtension.requestConsumptionTrend",
     requestConsumptionPlanDetail: "opportunitiesExtension.requestConsumptionPlanDetail",
     requestRatecardByPlan: "opportunitiesExtension.requestRatecardByPlan"
@@ -1134,8 +1135,17 @@ function createProductsCache({
   storageLocalGet,
   storageLocalSet
 }) {
+  let generation = 0;
+  async function invalidate() {
+    generation += 1;
+    productsCacheState.inFlightProducts.clear();
+    productsCacheState.productsCachePromise = Promise.resolve({});
+    await saveProductsCache({});
+  }
   async function getOpptyProducts(optyNumber, accessToken, cacheMaxAgeMs, onDebug = () => {}) {
+    const currentGeneration = generation;
     const cache = await getProductsCache();
+    if (generation !== currentGeneration) return getOpptyProducts(optyNumber, accessToken, cacheMaxAgeMs, onDebug);
     const cachedEntry = cache[optyNumber];
 
     if (cachedEntry && Array.isArray(cachedEntry.items) && Date.now() - Number(cachedEntry.fetchedAt) < cacheMaxAgeMs) {
@@ -1153,15 +1163,14 @@ function createProductsCache({
       })
         .then(async (items) => {
           const fetchedAt = Date.now();
-          cache[optyNumber] = {
-            fetchedAt,
-            items
-          };
-          await saveProductsCache(cache).catch(() => {});
+          if (generation === currentGeneration) {
+            cache[optyNumber] = { fetchedAt, items };
+            await saveProductsCache(cache).catch(() => {});
+          }
           return { items, fetchedAt };
         })
         .finally(() => {
-          productsCacheState.inFlightProducts.delete(optyNumber);
+          if (productsCacheState.inFlightProducts.get(optyNumber) === flight) productsCacheState.inFlightProducts.delete(optyNumber);
         });
     }
 
@@ -1207,7 +1216,7 @@ function createProductsCache({
     return productsCacheState.productsCacheWritePromise;
   }
 
-  return { getOpptyProducts, normalizeCacheMaxAge, getProductsCache, saveProductsCache };
+  return { invalidate, getOpptyProducts, normalizeCacheMaxAge, getProductsCache, saveProductsCache };
 }
 
 // Source: src/services/fusion/products.js
@@ -1720,6 +1729,7 @@ function startBackgroundApplication(dependencies) {
 /** Register synchronously; replies retain the WebExtension sendResponse contract. */
 function registerBackgroundMessages({
   messageTypes,
+  invalidateProductsCache,
   getXsrfTokenCookie,
   refreshXsrfCookie,
   requestAccountPlans,
@@ -1739,6 +1749,10 @@ runtimeApi.runtime.onMessage.addListener((message, sender, sendResponse) => {
       return false;
     }
 
+    if (message.type === messageTypes.invalidateProductsCache) {
+      invalidateProductsCache().then(() => sendResponse({ ok: true })).catch(error => sendResponse({ ok: false, error: error.message || "Unable to clear products cache." }));
+      return true;
+    }
     if (message.type === messageTypes.getXsrfToken) {
       getXsrfTokenCookie()
         .then((result) => {
@@ -2014,7 +2028,7 @@ function createBackgroundApplication(overrides = {}) {
   const requestOpptyProducts = (...args) => productsBackgroundJobs.requestOpptyProducts(...args);
   const runtimeApi = environment.browser || environment.chrome;
   function start() {
-    startBackgroundApplication({ messageTypes, requestCurrentUser, getXsrfTokenCookie, refreshXsrfCookie, requestAccountPlans, requestInstallBase, requestCustomerServiceRequest, requestWlActions, requestConsumerTokenService, requestConsumptionTrend, requestConsumptionPlanDetail, requestRatecardByPlan, requestOpptyProducts, runtimeApi });
+    startBackgroundApplication({ messageTypes, invalidateProductsCache: () => productsCache.invalidate(), requestCurrentUser, getXsrfTokenCookie, refreshXsrfCookie, requestAccountPlans, requestInstallBase, requestCustomerServiceRequest, requestWlActions, requestConsumerTokenService, requestConsumptionTrend, requestConsumptionPlanDetail, requestRatecardByPlan, requestOpptyProducts, runtimeApi });
   }
   return {
     start, contracts,