Merge pull request #1097 from alphagov/OLH-1204-cleanup-webchat-demo-…

…code OLH-1204 - Clean up webchat demo code.
govuk-one-login · Nov 7, 2023 · 6197a9a · 6197a9a
2 parents 0c43d2c + 5dc490c
commit 6197a9a
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 101 deletions.
diff --git a/.env.sample b/.env.sample
@@ -20,7 +20,6 @@ SESSION_STORE_TABLE_NAME=account-mgmt-frontend-SessionStore
 SUPPORT_ACTIVITY_LOG=1
 ACTIVITY_LOG_STORE_TABLE_NAME=activity_logs
 SUPPORT_TRIAGE_PAGE=1
-SUPPORT_WEBCHAT_DEMO=1
 WEBCHAT_SOURCE_URL=https://dev-chat-loader.smartagent.app/loader/main.js
 SUPPORT_WEBCHAT_CONTACT=1
 SUPPORT_PHONE_CONTACT=1

diff --git a/deploy/template.yaml b/deploy/template.yaml
@@ -142,7 +142,6 @@ Mappings:
       SERVICEDOMAIN: "dev.account.gov.uk"
       LOGSLEVEL: "debug"
       SUPPORTTRIAGEPAGE: "1"
-      SUPPORTWEBCHATDEMO: "1"
       WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js"
       SUPPORTWEBCHATCONTACT: "0"
       SUPPORTPHONECONTACT: "1"
@@ -163,7 +162,6 @@ Mappings:
       SERVICEDOMAIN: "build.account.gov.uk"
       LOGSLEVEL: "debug"
       SUPPORTTRIAGEPAGE: "1"
-      SUPPORTWEBCHATDEMO: "1"
       WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js"
       SUPPORTWEBCHATCONTACT: "0"
       SUPPORTPHONECONTACT: "0"
@@ -184,7 +182,6 @@ Mappings:
       SERVICEDOMAIN: "staging.account.gov.uk"
       LOGSLEVEL: "info"
       SUPPORTTRIAGEPAGE: "1"
-      SUPPORTWEBCHATDEMO: "1"
       WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js"
       SUPPORTWEBCHATCONTACT: "1"
       SUPPORTPHONECONTACT: "1"
@@ -205,7 +202,6 @@ Mappings:
       SERVICEDOMAIN: "integration.account.gov.uk"
       LOGSLEVEL: "info"
       SUPPORTTRIAGEPAGE: "1"
-      SUPPORTWEBCHATDEMO: "1"
       WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js"
       SUPPORTWEBCHATCONTACT: "0"
       SUPPORTPHONECONTACT: "1"
@@ -226,7 +222,6 @@ Mappings:
       SERVICEDOMAIN: "account.gov.uk"
       LOGSLEVEL: "info"
       SUPPORTTRIAGEPAGE: "1"
-      SUPPORTWEBCHATDEMO: "0"
       WEBCHATSOURCEURL: "0"
       SUPPORTWEBCHATCONTACT: "0"
       SUPPORTPHONECONTACT: "1"
@@ -614,13 +609,6 @@ Resources:
                   !Ref Environment,
                   SUPPORTTRIAGEPAGE,
                 ]
-            - Name: "SUPPORT_WEBCHAT_DEMO"
-              Value:
-                !FindInMap [
-                  EnvironmentVariables,
-                  !Ref Environment,
-                  SUPPORTWEBCHATDEMO,
-                ]
             - Name: "WEBCHAT_SOURCE_URL"
               Value:
                 !FindInMap [

diff --git a/src/app.constants.ts b/src/app.constants.ts
@@ -10,7 +10,6 @@ export const PATH_DATA: {
   SECURITY: { url: "/security" },
   YOUR_SERVICES: { url: "/your-services" },
   ENTER_PASSWORD: { url: "/enter-password" },
-  WEBCHAT_DEMO: { url: "/webchat-demo" },
   CHANGE_EMAIL: {
     url: "/change-email",
     event: "VERIFY_CODE_SENT",
@@ -174,4 +173,3 @@ export type ParamName = keyof QueryParameters;
 export const OIDC_ERRORS = {
   ACCESS_DENIED: "access_denied",
 };
-
diff --git a/src/app.ts b/src/app.ts
@@ -22,7 +22,7 @@ import {
   getSessionSecret,
   supportActivityLog,
   supportTriagePage,
-  supportWebchatDemo,
+  supportWebchatContact,
 } from "./config";
 import { logErrorMiddleware } from "./middleware/log-error-middleware";
 import { pageNotFoundHandler } from "./handlers/page-not-found-handler";
@@ -57,7 +57,6 @@ import { resendPhoneCodeRouter } from "./components/resend-phone-code/resend-pho
 import { redirectsRouter } from "./components/redirects/redirects-routes";
 import { contactRouter } from "./components/contact-govuk-one-login/contact-govuk-one-login-routes";
 import { getSessionStore } from "./utils/session-store";
-import { webchatRouter } from "./components/webchat-demo/webchat-demo-routes";
 import { outboundContactUsLinksMiddleware } from "./middleware/outbound-contact-us-links-middleware";
 import { trackAndRedirectRouter } from "./components/track-and-redirect/track-and-redirect-route";
 
@@ -100,7 +99,7 @@ async function createApp(): Promise<express.Application> {
     );
 
   app.use(i18nextMiddleware.handle(i18next));
-  if (supportWebchatDemo()) {
+  if (supportWebchatContact()) {
     app.use(helmet(webchatHelmetConfiguration));
   } else {
     app.use(helmet(helmetConfiguration));
@@ -157,9 +156,6 @@ async function createApp(): Promise<express.Application> {
   if (supportTriagePage()) {
     app.use(contactRouter);
   }
-  if (supportWebchatDemo()) {
-    app.use(webchatRouter);
-  }
   app.use(trackAndRedirectRouter);
 
   // Router for all previously used URLs, that we want to redirect on

diff --git a/src/components/webchat-demo/index.njk b/src/components/webchat-demo/index.njk
diff --git a/src/components/webchat-demo/tests/webchat-demo-controller.test.ts b/src/components/webchat-demo/tests/webchat-demo-controller.test.ts
diff --git a/src/components/webchat-demo/webchat-demo-controller.ts b/src/components/webchat-demo/webchat-demo-controller.ts
diff --git a/src/components/webchat-demo/webchat-demo-routes.ts b/src/components/webchat-demo/webchat-demo-routes.ts
diff --git a/src/config.ts b/src/config.ts
@@ -129,7 +129,7 @@ export const getAllowedAccountListClientIDs: string[] = [
   "criminalInjuriesCompensation",
   "9fduJ6KAE8WwCb1VCKp788BC8mM",
   "KiYrXyFTTy0JFZyYJI22WuxPIf8",
-  "ukmcab"
+  "ukmcab",
 ];
 
 export const getAllowedServiceListClientIDs: string[] = [
@@ -142,7 +142,7 @@ export const getAllowedServiceListClientIDs: string[] = [
   "socialWorkEngland",
   "dbs",
   "vehicleOperatorLicense",
-  "mortgageDeed"
+  "mortgageDeed",
 ];
 
 function getProtocol(): string {
@@ -163,10 +163,6 @@ export function supportTriagePage(): boolean {
   return process.env.SUPPORT_TRIAGE_PAGE === "1";
 }
 
-export function supportWebchatDemo(): boolean {
-  return process.env.SUPPORT_WEBCHAT_DEMO === "1";
-}
-
 export function getWebchatUrl(): string {
   return process.env.WEBCHAT_SOURCE_URL;
 }