Merge branch 'latest' into WSTEAM1-931-article-election-banner

bbc · Oct 18, 2024 · 5f840ab · 5f840ab
2 parents ea2a3e7 + 68c5b92
commit 5f840ab
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/src/server/Document/Renderers/litePageTransforms/index.test.ts b/src/server/Document/Renderers/litePageTransforms/index.test.ts
@@ -5,6 +5,8 @@ describe('litePageTransforms', () => {
     it('should append .lite suffix to valid hrefs', () => {
       const html = `
         <a href="https://www.bbc.com/news">News</a>
+        <a href="https://www.bbc.com/serbian/lat">News</a>
+        <a href="https://www.bbc.com/mundo">News</a>
         <a href="https://www.bbcrussian.com/news">News</a>
         <a href="/news">News</a>
       `;
@@ -13,31 +15,45 @@ describe('litePageTransforms', () => {
 
       expect(modifiedHtml).toEqual(`
         <a href="https://www.bbc.com/news.lite">News</a>
+        <a href="https://www.bbc.com/serbian/lat.lite">News</a>
+        <a href="https://www.bbc.com/mundo.lite">News</a>
         <a href="https://www.bbcrussian.com/news.lite">News</a>
         <a href="/news.lite">News</a>
       `);
     });
 
     it('should not append .lite suffix to invalid hrefs', () => {
-      const html = `
+      const originalHtml = `
         <a href="https://www.bbc.co.uk/news">News</a>
         <a href="https://www.bbc.com/news.lite">News</a>
         <a href="https://www.bbc.com/news.amp">News</a>
         <a href="#news">News</a>
         <a href="mailto:test@gmail.com">News</a>
       `;
 
-      const modifiedHtml = litePageTransforms(html);
+      const modifiedHtml = litePageTransforms(originalHtml);
+
+      expect(modifiedHtml).toEqual(originalHtml);
+    });
 
-      expect(modifiedHtml).toEqual(html);
+    it('should not append .lite suffix to an invalid "service"', () => {
+      const originalHtml = `
+        <a href="https://www.bbc.co.uk/future">Future</a>
+        <a href="https://www.bbc.com/food">Food</a>
+        <a href="https://www.bbc.com/weather">Weather</a>
+      `;
+
+      const modifiedHtml = litePageTransforms(originalHtml);
+
+      expect(modifiedHtml).toEqual(originalHtml);
     });
 
     it('should not append .lite suffix when no anchor tags are present', () => {
-      const html = '<p>I am a paragraph</p>';
+      const originalHtml = '<p>I am a paragraph</p>';
 
-      const modifiedHtml = litePageTransforms(html);
+      const modifiedHtml = litePageTransforms(originalHtml);
 
-      expect(modifiedHtml).toEqual(html);
+      expect(modifiedHtml).toEqual(originalHtml);
     });
   });
 });
diff --git a/src/server/Document/Renderers/litePageTransforms/transformAnchorTags.ts b/src/server/Document/Renderers/litePageTransforms/transformAnchorTags.ts
@@ -1,3 +1,8 @@
+import { Services } from '#app/models/types/global';
+import services from '#lib/config/services/loadableConfig';
+
+const SERVICES = Object.keys(services) as Services[];
+
 const VALID_DOMAINS = [
   '/',
   'localhost',
@@ -15,9 +20,18 @@ const isValidHref = (href: string) => {
   const extension = url?.pathname?.split('.')?.pop() || '';
   const startsWithHash = href?.startsWith('#');
 
+  const hasReservedRouteExtension =
+    RESERVED_ROUTE_EXTENSIONS.includes(extension);
+
+  const isValidDomain = VALID_DOMAINS.includes(url.hostname);
+  const isWsService = SERVICES.includes(
+    url?.pathname?.split('/')?.[1] as Services,
+  );
+
   return (
-    VALID_DOMAINS.includes(url.hostname) &&
-    !RESERVED_ROUTE_EXTENSIONS.includes(extension) &&
+    isValidDomain &&
+    isWsService &&
+    !hasReservedRouteExtension &&
     !startsWithHash
   );
 };