Merge branch 'latest' into WSTEAMA-303-message-banner-tracking

bbc · Jan 22, 2024 · 2aa1ba0 · 2aa1ba0
2 parents 749d761 + 6fe8868
commit 2aa1ba0
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 36 deletions.
diff --git a/.github/workflows/simorgh-local-server-tests.yml b/.github/workflows/simorgh-local-server-tests.yml
@@ -21,6 +21,8 @@ jobs:
     env:
       CI: true
       LOG_LEVEL: 'error'
+      BFF_PATH: 'https://web-cdn.test.api.bbci.co.uk/fd/simorgh-bff'
+      LIGHTHOUSE_BUILD: true
 
     steps:
       - uses: actions/checkout@v3
@@ -54,7 +56,7 @@ jobs:
 
       - name: Start Simorgh Server - Next.JS App
         working-directory: ./ws-nextjs-app
-        run: nohup node build/standalone/server.js > /dev/null 2>&1 &
+        run: PORT=7081 nohup node build/standalone/ws-nextjs-app/server.js &
 
       - name: Run AMP Validator
         run: yarn amp:validate

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,14 +6,17 @@
   "configurations": [
     {
       "type": "node",
-      "runtimeVersion": "16",
+      "runtimeVersion": "18",
       "request": "launch",
       "name": "Debug Express App",
       "program": "${workspaceFolder}/node_modules/webpack/bin/webpack.js",
       "args": [
         "--watch", "--progress", "--env" , "config='server'"
       ],
-      "env" : { "NODE_ENV" : "development" }
+      "env" : { "NODE_ENV" : "development" },
+      "skipFiles": [
+        "${workspaceFolder}/node_modules/**/*",
+      ]
     }
   ]
 }
diff --git a/.yarn/cache/helmet-npm-4.6.0-f244fd965c-139ad678d1.zip b/.yarn/cache/helmet-npm-4.6.0-f244fd965c-139ad678d1.zip
diff --git a/.yarn/cache/helmet-npm-7.1.0-0f9f70fa93-16aaa0df99.zip b/.yarn/cache/helmet-npm-7.1.0-0f9f70fa93-16aaa0df99.zip
diff --git a/package.json b/package.json
@@ -108,7 +108,7 @@
     "dotenv": "16.0.3",
     "express": "4.18.2",
     "express-static-gzip": "2.1.7",
-    "helmet": "4.6.0",
+    "helmet": "7.1.0",
     "helmet-csp": "3.4.0",
     "intersection-observer": "0.12.2",
     "isarray": "2.0.5",

diff --git a/scripts/lighthouseRun.sh b/scripts/lighthouseRun.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
-
 npx -p lighthouse@11.3.0 lighthouse http://localhost:7080/news/articles/cn7k01xp8kxo --chrome-flags="--no-sandbox --headless --disable-gpu" --output json --output html --output-path simorgh --config-path scripts/lighthouseConfig.js && node scripts/lighthouseBudget.js run
 npx -p lighthouse@11.3.0 lighthouse http://localhost:7080/kyrgyz --chrome-flags="--no-sandbox --headless --disable-gpu" --output json --output html --output-path simorgh --config-path scripts/lighthouseConfig.js && node scripts/lighthouseBudget.js run
+npx -p lighthouse@11.3.0 lighthouse http://localhost:7081/pidgin/live/c7p765ynk9qt --chrome-flags="--no-sandbox --headless --disable-gpu" --output json --output html --output-path simorgh --config-path scripts/lighthouseConfig.js && node scripts/lighthouseBudget.js run
+npx -p lighthouse@11.3.0 lighthouse http://localhost:7081/pidgin/live/c07zr0zwjnnt --chrome-flags="--no-sandbox --headless --disable-gpu" --output json --output html --output-path simorgh --config-path scripts/lighthouseConfig.js && node scripts/lighthouseBudget.js run
diff --git a/src/app/routes/cpsAsset/getInitialData/convertToOptimoBlocks/index.js b/src/app/routes/cpsAsset/getInitialData/convertToOptimoBlocks/index.js
@@ -20,7 +20,7 @@ const nodeLogger = require('#lib/logger.node');
 const logger = nodeLogger(__filename);
 
 const handleMissingType = (block, json, assetType) =>
-  logger.info(UNSUPPORTED_BLOCK_TYPE, {
+  logger.debug(UNSUPPORTED_BLOCK_TYPE, {
     url: json.metadata.locators.assetUri,
     type: block.type,
     assetType,

diff --git a/src/app/routes/cpsAsset/getInitialData/convertToOptimoBlocks/index.test.js b/src/app/routes/cpsAsset/getInitialData/convertToOptimoBlocks/index.test.js
@@ -293,7 +293,7 @@ describe('convertToOptimoBlocks', () => {
     });
   });
 
-  it('should log info if block type is unsupported', async () => {
+  it('should log debug if block type is unsupported', async () => {
     const url = '/service/path/to/asset';
     const type = 'unsupported-type-name-here';
     const assetType = MEDIA_ASSET_PAGE;
@@ -312,7 +312,7 @@ describe('convertToOptimoBlocks', () => {
     };
 
     await convertToOptimoBlocks(input);
-    expect(loggerMock.info).toHaveBeenCalledWith(UNSUPPORTED_BLOCK_TYPE, {
+    expect(loggerMock.debug).toHaveBeenCalledWith(UNSUPPORTED_BLOCK_TYPE, {
       url,
       type,
       assetType,

diff --git a/src/app/routes/utils/certsRequired/index.test.ts b/src/app/routes/utils/certsRequired/index.test.ts
@@ -7,30 +7,39 @@ jest.mock('../getEnvironment', () =>
 
 describe('certsRequired', () => {
   const originalIntegrationTestBuild = process.env.INTEGRATION_TEST_BUILD;
+  const originaLighthouseTestBuild = process.env.LIGHTHOUSE_TEST_BUILD;
 
   afterEach(() => {
     process.env.INTEGRATION_TEST_BUILD = originalIntegrationTestBuild;
+    process.env.LIGHTHOUSE_TEST_BUILD = originaLighthouseTestBuild;
   });
 
   it.each`
-    url         | environment  | integrationTestBuild | expected
-    ${'/mundo'} | ${'local'}   | ${undefined}         | ${false}
-    ${'/mundo'} | ${'local'}   | ${'true'}            | ${false}
-    ${'/mundo'} | ${'local'}   | ${true}              | ${false}
-    ${'/mundo'} | ${undefined} | ${undefined}         | ${false}
-    ${'/mundo'} | ${undefined} | ${'true'}            | ${false}
-    ${'/mundo'} | ${undefined} | ${true}              | ${false}
-    ${'/mundo'} | ${'test'}    | ${undefined}         | ${true}
-    ${'/mundo'} | ${'test'}    | ${'true'}            | ${false}
-    ${'/mundo'} | ${'test'}    | ${true}              | ${false}
-    ${'/mundo'} | ${'live'}    | ${undefined}         | ${true}
-    ${'/mundo'} | ${'live'}    | ${'true'}            | ${false}
-    ${'/mundo'} | ${'live'}    | ${true}              | ${false}
+    url         | environment  | integrationTestBuild | lighthouseTestBuild | expected
+    ${'/mundo'} | ${'local'}   | ${undefined}         | ${undefined}        | ${false}
+    ${'/mundo'} | ${'local'}   | ${'true'}            | ${'true'}           | ${false}
+    ${'/mundo'} | ${'local'}   | ${true}              | ${true}             | ${false}
+    ${'/mundo'} | ${undefined} | ${undefined}         | ${undefined}        | ${false}
+    ${'/mundo'} | ${undefined} | ${'true'}            | ${'true'}           | ${false}
+    ${'/mundo'} | ${undefined} | ${true}              | ${true}             | ${false}
+    ${'/mundo'} | ${'test'}    | ${undefined}         | ${undefined}        | ${true}
+    ${'/mundo'} | ${'test'}    | ${'true'}            | ${'true'}           | ${false}
+    ${'/mundo'} | ${'test'}    | ${true}              | ${true}             | ${false}
+    ${'/mundo'} | ${'live'}    | ${undefined}         | ${undefined}        | ${true}
+    ${'/mundo'} | ${'live'}    | ${'true'}            | ${'true'}           | ${false}
+    ${'/mundo'} | ${'live'}    | ${true}              | ${true}             | ${false}
   `(
-    'returns $expected when environment is $environment, integrationTestBuild is $integrationTestBuild and url is $url',
-    ({ url, environment, integrationTestBuild, expected }) => {
+    'returns $expected when environment is $environment, integrationTestBuild is $integrationTestBuild, lighthouseTestBuild is $lighthouseTestBuild and url is $url',
+    ({
+      url,
+      environment,
+      integrationTestBuild,
+      lighthouseTestBuild,
+      expected,
+    }) => {
       (getEnvironment as jest.Mock).mockImplementationOnce(() => environment);
       process.env.INTEGRATION_TEST_BUILD = integrationTestBuild;
+      process.env.LIGHTHOUSE_TEST_BUILD = lighthouseTestBuild;
       expect(certsRequired(url)).toBe(expected);
     },
   );

diff --git a/src/app/routes/utils/certsRequired/index.ts b/src/app/routes/utils/certsRequired/index.ts
@@ -3,5 +3,9 @@ import getEnvironment from '../getEnvironment';
 export default (pathname: string) => {
   const environment = getEnvironment(pathname);
   const isLocal = environment === 'local' || !environment;
-  return !isLocal && process.env.INTEGRATION_TEST_BUILD !== 'true';
+  return (
+    !isLocal &&
+    process.env.INTEGRATION_TEST_BUILD !== 'true' &&
+    process.env.LIGHTHOUSE_BUILD !== 'true'
+  );
 };
diff --git a/src/server/index.jsx b/src/server/index.jsx
@@ -86,9 +86,12 @@ server
   .use(compression())
   .use(
     helmet({
-      expectCt: false,
       frameguard: { action: 'deny' },
       contentSecurityPolicy: false,
+      crossOriginEmbedderPolicy: false,
+      crossOriginOpenerPolicy: false,
+      crossOriginResourcePolicy: false,
+      originAgentCluster: false,
     }),
   )
   .use(logResponseTime)

diff --git a/ws-nextjs-app/pages/[service]/live/[id]/[[...variant]].page.tsx b/ws-nextjs-app/pages/[service]/live/[id]/[[...variant]].page.tsx
@@ -6,6 +6,7 @@ import getToggles from '#app/lib/utilities/getToggles/withCache';
 import { LIVE_PAGE } from '#app/routes/utils/pageTypes';
 import nodeLogger from '#lib/logger.node';
 import logResponseTime from '#server/utilities/logResponseTime';
+import isAppPath from '#app/routes/utils/isAppPath';
 
 import {
   ROUTING_INFORMATION,
@@ -41,7 +42,7 @@ const getPageData = async ({
   page,
   service,
   variant,
-  rendererEnv,
+  rendererEnv = 'test',
 }: PageDataParams) => {
   const pathname = `${id}${rendererEnv ? `?renderer_env=${rendererEnv}` : ''}`;
   const livePageUrl = constructPageFetchUrl({
@@ -107,17 +108,20 @@ export const getServerSideProps: GetServerSideProps = async context => {
     id,
     service,
     variant,
-    // renderer_env: rendererEnv,
+    renderer_env: rendererEnv,
     page = '1',
   } = context.query as PageDataParams;
 
   const { headers: reqHeaders } = context.req;
 
+  const isApp = isAppPath(context.resolvedUrl);
+
   if (!isValidPageNumber(page)) {
     context.res.statusCode = 404;
     return {
       props: {
         bbcOrigin: reqHeaders['bbc-origin'] || null,
+        isApp,
         isNextJs: true,
         service,
         status: 404,
@@ -142,7 +146,7 @@ export const getServerSideProps: GetServerSideProps = async context => {
     page,
     service,
     variant,
-    rendererEnv: 'test', // TODO: remove hardcoding
+    rendererEnv,
   });
 
   let routingInfoLogger = logger.debug;
@@ -162,6 +166,7 @@ export const getServerSideProps: GetServerSideProps = async context => {
       bbcOrigin: reqHeaders['bbc-origin'] || null,
       error: data?.error || null,
       id,
+      isApp,
       isAmp: false,
       isNextJs: true,
       page: page || null,

diff --git a/ws-nextjs-app/pages/_document.page.tsx b/ws-nextjs-app/pages/_document.page.tsx
@@ -7,18 +7,20 @@ import Document, {
 } from 'next/document';
 import * as React from 'react';
 import { Helmet, HelmetData } from 'react-helmet';
+import isAppPath from '#app/routes/utils/isAppPath';
 
-type DocProps = { helmet: HelmetData };
+type DocProps = { helmet: HelmetData; isApp: boolean };
 
 export default class AppDocument extends Document<DocProps> {
   static async getInitialProps(ctx: DocumentContext) {
     const initialProps = await Document.getInitialProps(ctx);
+    const isApp = isAppPath(ctx.asPath || '');
 
-    return { ...initialProps, helmet: Helmet.renderStatic() };
+    return { ...initialProps, helmet: Helmet.renderStatic(), isApp };
   }
 
   render() {
-    const { helmet } = this.props;
+    const { helmet, isApp } = this.props;
 
     const htmlAttrs = helmet.htmlAttributes.toComponent();
     const meta = helmet.meta.toComponent();
@@ -29,6 +31,7 @@ export default class AppDocument extends Document<DocProps> {
     return (
       <Html {...htmlAttrs}>
         <Head>
+          {isApp && <meta name="robots" content="noindex" />}
           {meta}
           {title}
           {helmetLinkTags}

diff --git a/yarn.lock b/yarn.lock
@@ -13321,10 +13321,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"helmet@npm:4.6.0":
-  version: 4.6.0
-  resolution: "helmet@npm:4.6.0"
-  checksum: 139ad678d1cab207b043c206f50f6744eff2ef1f463e4626d36718b45b337485c77d10260ef9d89d292fa678da5153d86b08172b3b365cc8e680241015ed3a49
+"helmet@npm:7.1.0":
+  version: 7.1.0
+  resolution: "helmet@npm:7.1.0"
+  checksum: 16aaa0df997eaa18821e71389bc9ceffeeaa935df98427ede2bb006065f7e02bb1941caabea16d5a93a791cb3fe7d8a760266bc57b3b9ca5dd7da17ea84244b8
   languageName: node
   linkType: hard
 
@@ -20889,7 +20889,7 @@ __metadata:
     express-static-gzip: 2.1.7
     fetch-mock: 9.11.0
     glob: 8.0.3
-    helmet: 4.6.0
+    helmet: 7.1.0
     helmet-csp: 3.4.0
     history: 4.10.1
     husky: 8.0.3