Promote from main to preprod

README.md

@@ -30,7 +30,7 @@ can [create an IAP tunnel](https://cloud.google.com/sdk/gcloud/reference/compute
 Instance running the rest API in a sandbox.
 
 ```shell
-gcloud compute start-iap-tunnel restapi-1 90 --local-host-port=localhost:90 --zone europe-west2-a
+gcloud compute start-iap-tunnel restapi-1 80 --local-host-port=localhost:5011 --zone europe-west2-a
 ```
 
 #### Setup locally steps
@@ -56,7 +56,7 @@ The `.env` file should be setup as below
 ```.env
 VM_EXTERNAL_WEB_URL='tel-client-server.uk'
 VM_EXTERNAL_CLIENT_URL='tel-web-server.uk'
-BLAISE_API_URL='localhost:90'
+BLAISE_API_URL='http://localhost:5011'
 BIMS_API_URL='https://bims-url'
 ```
 

package.json

@@ -4,8 +4,8 @@
   "description": "",
   "main": "index.ts",
   "scripts": {
-    "start": "node ./dist/server/index.js",
-    "start-server": "tsc --project tsconfig.server.json && node ./dist/server/index.js",
+    "start": "node ./dist/index.js",
+    "start-server": "tsc --project tsconfig.server.json && node ./dist/index.js",
     "start-react": "react-scripts start",
     "build-react": "react-scripts build",
     "test": "jest --coverage --watchAll=false",
@@ -30,6 +30,7 @@
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
     "axios": "^0.24.0",
+    "blaise-api-node-client": "https://github.com/ONSdigital/blaise-api-node-client",
     "blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#0.13.2",
     "concurrently": "^7.6.0",
     "dotenv": "^16.0.3",
@@ -62,7 +63,8 @@
     "eslint": "^7.13.0",
     "eslint-plugin-react": "^7.21.5",
     "jest-extended": "^0.11.5",
-    "supertest": "^6.3.3"
+    "supertest": "^6.3.3",
+    "typemoq": "^2.1.0"
   },
   "browserslist": {
     "production": [

public/index.html

@@ -42,8 +42,8 @@
     -->
     <script>
       // Passing in variables from express to the react app
-      window.VM_EXTERNAL_CLIENT_URL = "\<\%= VM_EXTERNAL_CLIENT_URL \%\>";
-      window.CATI_DASHBOARD_URL = "\<\%= CATI_DASHBOARD_URL \%\>";
+      window.VM_EXTERNAL_CLIENT_URL = "\<\%= clientUrl \%\>";
+      window.CATI_DASHBOARD_URL = "\<\%= dashboardUrl \%\>";
     </script>
   </body>
 </html>

server/Config.ts

@@ -1,4 +1,4 @@
-interface EnvironmentVariables {
+export interface EnvironmentVariables {
     VM_EXTERNAL_CLIENT_URL: string
     VM_EXTERNAL_WEB_URL: string
     BLAISE_API_URL: string
@@ -42,8 +42,15 @@ export function getEnvironmentVariables(): EnvironmentVariables {
 
     return {VM_EXTERNAL_CLIENT_URL, 
         VM_EXTERNAL_WEB_URL, 
-        BLAISE_API_URL, 
+        BLAISE_API_URL: fixURL(BLAISE_API_URL),
         CATI_DASHBOARD_URL, 
         BIMS_CLIENT_ID, 
         BIMS_API_URL};
 }
+
+function fixURL(url: string): string {
+    if (url.startsWith("ENV_VAR_NOT_SET") || url.startsWith("http")) {
+        return url;
+    }
+    return `http://${url}`;
+}