From 1e1088837df64ddf5413aa9d052792a76ae0eb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= <DafyddLlyr@gmail.com>
Date: Wed, 5 Jul 2023 12:30:35 +0100
Subject: [PATCH] feat: Move E2E env var logic to docker-compose

---
 .env.example                 |  1 -
 api.planx.uk/send/uniform.ts | 35 ++++++-----------------------------
 docker-compose.e2e.yml       |  8 ++++++++
 docker-compose.yml           |  5 -----
 4 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/.env.example b/.env.example
index c75fc5e8dd..df73608cf3 100644
--- a/.env.example
+++ b/.env.example
@@ -103,5 +103,4 @@ BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=https://buckinghamshire.${BOPS_API_ROOT_DOMA
 #
 ## End-to-end test team (borrows Lambeth's details)
 GOV_UK_PAY_TOKEN_E2E=👻
-UNIFORM_CLIENT_E2E=e2e:123
 BOPS_SUBMISSION_URL_E2E=https://lambeth.${BOPS_API_ROOT_DOMAIN}
diff --git a/api.planx.uk/send/uniform.ts b/api.planx.uk/send/uniform.ts
index 76c4241e1d..9f7ebec6e4 100644
--- a/api.planx.uk/send/uniform.ts
+++ b/api.planx.uk/send/uniform.ts
@@ -274,19 +274,13 @@ async function authenticate({
   clientId,
   clientSecret,
 }: UniformClient): Promise<UniformAuthResponse> {
-  const isTest = clientId.toUpperCase() === "E2E";
-
-  const target = isTest
-    ? process.env.E2E_MOCK_SERVER!
-    : process.env.UNIFORM_TOKEN_URL!;
-
   const authString = Buffer.from(`${clientId}:${clientSecret}`).toString(
     "base64"
   );
 
   const authConfig: AxiosRequestConfig = {
     method: "POST",
-    url: target,
+    url: process.env.UNIFORM_TOKEN_URL!,
     headers: {
       Authorization: `Basic ${authString}`,
       "Content-type": "application/x-www-form-urlencoded",
@@ -305,7 +299,7 @@ async function authenticate({
   }
 
   const uniformAuthResponse: UniformAuthResponse = {
-    token: isTest ? "TEST_TOKEN" : response.data.access_token,
+    token: response.data.access_token,
     organisation: response.data["organisation-name"],
     organisationId: response.data["organisation-id"],
   };
@@ -323,15 +317,9 @@ async function createSubmission(
   organisationId: string,
   sessionId = "TEST"
 ): Promise<string> {
-  const isTest = token === "TEST_TOKEN";
-
-  const submissionURL = isTest
-    ? process.env.E2E_MOCK_SERVER!
-    : process.env.UNIFORM_SUBMISSION_URL!;
-
-  const createSubmissionEndpoint = `${submissionURL}/secure/submission`;
+  const createSubmissionEndpoint = `${process.env.UNIFORM_SUBMISSION_URL!}/secure/submission`;
 
-  const isStaging = isTest || submissionURL.includes("staging");
+  const isStaging = ["mock-server", "staging"].some(hostname => createSubmissionEndpoint.includes(hostname));
 
   const createSubmissionConfig: AxiosRequestConfig = {
     url: createSubmissionEndpoint,
@@ -380,13 +368,8 @@ async function attachArchive(
     );
     return false;
   }
-  const isTest = token === "TEST_TOKEN";
 
-  const submissionURL = isTest
-    ? process.env.E2E_MOCK_SERVER!
-    : process.env.UNIFORM_SUBMISSION_URL!;
-
-  const attachArchiveEndpoint = `${submissionURL}/secure/submission/${submissionId}/archive`;
+  const attachArchiveEndpoint = `${process.env.UNIFORM_SUBMISSION_URL!}/secure/submission/${submissionId}/archive`;
 
   const formData = new FormData();
   formData.append("file", fs.createReadStream(zipPath));
@@ -417,13 +400,7 @@ async function retrieveSubmission(
   token: string,
   submissionId: string
 ): Promise<UniformSubmissionResponse> {
-  const isTest = token === "TEST_TOKEN";
-
-  const submissionURL = isTest
-    ? process.env.E2E_MOCK_SERVER!
-    : process.env.UNIFORM_SUBMISSION_URL!;
-
-  const getSubmissionEndpoint = `${submissionURL}/secure/submission/${submissionId}`;
+  const getSubmissionEndpoint = `${process.env.UNIFORM_SUBMISSION_URL!}/secure/submission/${submissionId}`;
 
   const getSubmissionConfig: AxiosRequestConfig = {
     url: getSubmissionEndpoint,
diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml
index 6946104383..a3d09eba89 100644
--- a/docker-compose.e2e.yml
+++ b/docker-compose.e2e.yml
@@ -23,3 +23,11 @@ services:
         condition: service_healthy
     entrypoint: sh
     command: -c "echo ready for testing"
+
+  api:
+    environment:
+      UNIFORM_SUBMISSION_URL: http://mock-server:8080
+      UNIFORM_TOKEN_URL: http://mock-server:8080
+      UNIFORM_CLIENT_E2E: e2e:123
+      GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E}
+      BOPS_SUBMISSION_URL_E2E: http://mock-server:8080
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8d7a820989..f28644da50 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -167,11 +167,6 @@ services:
       UNIFORM_CLIENT_CHILTERN: ${UNIFORM_CLIENT_CHILTERN}
       UNIFORM_CLIENT_WYCOMBE: ${UNIFORM_CLIENT_WYCOMBE}
       BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE: ${BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE}
-      # E2E
-      GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E}
-      E2E_MOCK_SERVER: http://mock-server:8080
-      UNIFORM_CLIENT_E2E: ${UNIFORM_CLIENT_E2E}
-      BOPS_SUBMISSION_URL_E2E: http://mock-server:8080
 
   sharedb:
     restart: unless-stopped