Address PR feedback: map+flat chain, remove dedupe, resourceTypes, drop hlxSidekickProjects

Author: davidnuescheler

src/extension/auth.js

@@ -42,36 +42,46 @@ export function getHostDomain(host) {
  * @returns {Object[]} Rules to add
  */
 export function getCacheControlRules(projectConfigs) {
-  const seen = new Set();
   const rules = [];
-  const hosts = projectConfigs.flatMap((p) => [
-    p?.host,
-    p?.previewHost,
-    p?.liveHost,
-    p?.reviewHost,
-  ].filter(Boolean).map(getHostDomain)).filter(Boolean);
-  hosts.forEach((domain) => {
-    if (seen.has(domain)) return;
-    seen.add(domain);
-    const escaped = domain.replace(/\./g, '\\.');
-    rules.push({
-      id: getRandomId(),
-      priority: 1,
-      action: {
-        type: 'modifyHeaders',
-        responseHeaders: [{
-          header: 'Cache-Control',
-          operation: 'set',
-          value: `max-age=${CACHE_MAX_AGE_SECONDS}`,
-        }],
-      },
-      condition: {
-        regexFilter: `^https://${escaped}/.*`,
-        requestMethods: ['get'],
-        resourceTypes: ['main_frame', 'sub_frame', 'xmlhttprequest', 'other'],
-      },
+  projectConfigs
+    .map((p) => [
+      p?.host,
+      p?.previewHost,
+      p?.liveHost,
+      p?.reviewHost,
+    ].filter(Boolean).map(getHostDomain))
+    .flat()
+    .filter(Boolean)
+    .forEach((domain) => {
+      const escaped = domain.replace(/\./g, '\\.');
+      rules.push({
+        id: getRandomId(),
+        priority: 1,
+        action: {
+          type: 'modifyHeaders',
+          responseHeaders: [{
+            header: 'Cache-Control',
+            operation: 'set',
+            value: `max-age=${CACHE_MAX_AGE_SECONDS}`,
+          }],
+        },
+        condition: {
+          regexFilter: `^https://${escaped}/.*`,
+          requestMethods: ['get'],
+          resourceTypes: [
+            'main_frame',
+            'sub_frame',
+            'script',
+            'stylesheet',
+            'image',
+            'xmlhttprequest',
+            'media',
+            'font',
+            'other',
+          ],
+        },
+      });
     });
-  });
   return rules;
 }
 
@@ -91,8 +101,7 @@ export async function configureAuthAndCorsHeaders() {
     const allRules = [];
 
     // Cache-Control rules for added project hosts (prod, preview, live, review) – override to 1 min
-    const syncHandles = await getConfig('sync', 'projects')
-      || await getConfig('sync', 'hlxSidekickProjects') || [];
+    const syncHandles = await getConfig('sync', 'projects') || [];
     const syncConfigs = (await Promise.all(
       syncHandles.map((handle) => getConfig('sync', handle)),
     )).filter(Boolean);

test/auth.test.js

@@ -89,14 +89,14 @@ describe('Test auth', () => {
       expect(filters).to.include('^https://preview\\.example\\.com/.*');
       expect(filters).to.include('^https://live\\.example\\.com/.*');
     });
-    it('deduplicates same host across configs', () => {
+    it('adds one rule per host occurrence (no deduplication)', () => {
       const configs = [
         { host: 'same.com', previewHost: 'same.com' },
         { liveHost: 'same.com' },
       ];
       const rules = getCacheControlRules(configs);
-      expect(rules).to.have.lengthOf(1);
-      expect(rules[0].condition.regexFilter).to.equal('^https://same\\.com/.*');
+      expect(rules).to.have.lengthOf(3);
+      expect(rules.every((r) => r.condition.regexFilter === '^https://same\\.com/.*')).to.be.true;
     });
     it('extracts host from full URL in config', () => {
       const configs = [{ host: 'https://url-host.com/path' }];