Rename vars to remove 'Mock' incase needed for actual env hookups

Author: jsed-nhs

docker-compose.yml

@@ -8,8 +8,8 @@ services:
     environment:
       NBS_API_BASE_URL: http://api:80
       AUTH_HOST: http://localhost:7071
-      MOCK_OIDC_SERVER_BASE_URL: http://localhost:8020
-      MOCK_AUTHENTICATION_ISSUER_URL: https://localhost:8010
+      OIDC_SERVER_BASE_URL: http://localhost:8020
+      AUTHENTICATION_ISSUER_URL: https://localhost:8010
       CLIENT_BASE_PATH: /manage-your-appointments
       BUILD_NUMBER: ${BUILD_NUMBER:-local}
       OTEL_EXPORTER_OTLP_ENDPOINT: http://splunk-otel-collector:4318

src/client/.env

@@ -1,7 +1,7 @@
 NBS_API_BASE_URL=http://localhost:7071
 AUTH_HOST=http://localhost:7071
-MOCK_OIDC_SERVER_BASE_URL=http://localhost:8020
-MOCK_AUTHENTICATION_ISSUER_URL=https://localhost:8010
+OIDC_SERVER_BASE_URL=http://localhost:8020
+AUTHENTICATION_ISSUER_URL=https://localhost:8010
 CLIENT_BASE_PATH=/manage-your-appointments
 BUILD_NUMBER=local
 OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318

src/client/src/middleware.ts

@@ -12,8 +12,8 @@ export function middleware(request: NextRequest) {
   const permittedConnectUrls = [
     process.env.NBS_API_BASE_URL!,
     process.env.AUTH_HOST!,
-    process.env.MOCK_OIDC_SERVER_BASE_URL!,
-    process.env.MOCK_AUTHENTICATION_ISSUER_URL!,
+    process.env.OIDC_SERVER_BASE_URL!,
+    process.env.AUTHENTICATION_ISSUER_URL!,
     'https://js.monitor.azure.com',
     'https://dc.services.visualstudio.com',
   ];

src/client/testing/fixtures-v2.ts

@@ -210,7 +210,7 @@ export const test = base.extend<MyaFixtures>({
       env.COSMOS_ENDPOINT,
       env.COSMOS_TOKEN,
     );
-    const mockOidcClient = new MockOidcClient(env.MOCK_OIDC_SERVER_BASE_URL);
+    const mockOidcClient = new MockOidcClient(env.OIDC_SERVER_BASE_URL);
     const featureFlagClient = new FeatureFlagClient(env.NBS_API_BASE_URL);
 
     const testId = generateUniqueTestId(testInfo);

src/client/testing/playwright.env

@@ -4,6 +4,6 @@ COSMOS_ENDPOINT=https://localhost:8081
 COSMOS_TOKEN=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
 BUILD_NUMBER=local
 NBS_API_BASE_URL=http://localhost:7071
-MOCK_OIDC_SERVER_BASE_URL=http://localhost:8020
-MOCK_AUTHENTICATION_ISSUER_URL=https://localhost:8010
+OIDC_SERVER_BASE_URL=http://localhost:8020
+AUTHENTICATION_ISSUER_URL=https://localhost:8010
 CANCEL_A_DATE_RANGE_MAXIMUM_DAYS=90

src/client/testing/testEnvironment.ts

@@ -10,8 +10,8 @@ const environment = {
   COSMOS_TOKEN: process.env.COSMOS_TOKEN ?? '',
   BUILD_NUMBER: process.env.BUILD_NUMBER ?? '',
   NBS_API_BASE_URL: process.env.NBS_API_BASE_URL ?? 'http://localhost:7071',
-  MOCK_OIDC_SERVER_BASE_URL:
-    process.env.MOCK_OIDC_SERVER_BASE_URL ?? 'http://localhost:8020',
+  OIDC_SERVER_BASE_URL:
+    process.env.OIDC_SERVER_BASE_URL ?? 'http://localhost:8020',
 };
 
 export default environment;