Merge pull request #524 from alphagov/auth-1385-add-referrer

AUTH-1385 - Add referer to Zendesk api

Author: JHjava

src/components/contact-us/contact-us-controller.ts

@@ -37,13 +37,24 @@ export function contactUsGet(req: Request, res: Response): void {
   if (req.query.supportType === SUPPORT_TYPE.GOV_SERVICE) {
     return res.render("contact-us/index-gov-service-contact-us.njk");
   }
+  let fromPage = req.headers.referer;
 
-  return res.render("contact-us/index-public-contact-us.njk");
+  if (req.headers.referer && req.headers.referer.includes("fromPage")) {
+    const urlObj = new URL(req.headers.referer);
+    fromPage = urlObj.searchParams.get("fromPage");
+  }
+
+  return res.render("contact-us/index-public-contact-us.njk", {
+    fromPage: fromPage,
+  });
 }
 
 export function contactUsFormPost(req: Request, res: Response): void {
   let url = PATH_NAMES.CONTACT_US_QUESTIONS;
-  const queryParams = new URLSearchParams({ theme: req.body.theme }).toString();
+  const queryParams = new URLSearchParams({
+    theme: req.body.theme,
+    fromPage: req.body.fromPage,
+  }).toString();
   if (
     [ZENDESK_THEMES.ACCOUNT_CREATION, ZENDESK_THEMES.SIGNING_IN].includes(
       req.body.theme
@@ -55,8 +66,12 @@ export function contactUsFormPost(req: Request, res: Response): void {
 }
 
 export function furtherInformationGet(req: Request, res: Response): void {
+  if (!req.query.theme) {
+    return res.redirect(PATH_NAMES.CONTACT_US);
+  }
   return res.render("contact-us/further-information/index.njk", {
     theme: req.query.theme,
+    fromPage: req.query.fromPage,
   });
 }
 
@@ -65,12 +80,16 @@ export function furtherInformationPost(req: Request, res: Response): void {
   const queryParams = new URLSearchParams({
     theme: req.body.theme,
     subtheme: req.body.subtheme,
+    fromPage: req.body.fromPage,
   }).toString();
 
   res.redirect(url + "?" + queryParams);
 }
 
 export function contactUsQuestionsGet(req: Request, res: Response): void {
+  if (!req.query.theme) {
+    return res.redirect(PATH_NAMES.CONTACT_US);
+  }
   let pageTitle = themeToPageTitle[req.query.theme as string];
   if (
     req.query.subtheme === ZENDESK_THEMES.SOMETHING_ELSE &&
@@ -84,6 +103,7 @@ export function contactUsQuestionsGet(req: Request, res: Response): void {
     theme: req.query.theme,
     subtheme: req.query.subtheme,
     backurl: req.headers.referer,
+    fromPage: req.query.fromPage,
     pageTitleHeading: pageTitle,
   });
 }
@@ -116,6 +136,7 @@ export function contactUsQuestionsFormPost(
       feedbackContact: req.body.contact === "true",
       questions: questions,
       themeQuestions: themeQuestions,
+      referer: req.body.fromPage,
     });
 
     return res.redirect(PATH_NAMES.CONTACT_US_SUBMIT_SUCCESS);

src/components/contact-us/contact-us-service.ts

@@ -25,7 +25,8 @@ export function contactUsService(
             contactForm.descriptions,
             contactForm.optionalData,
             contactForm.questions,
-            contactForm.themeQuestions
+            contactForm.themeQuestions,
+            contactForm.referer
           ),
         },
         group_id: getZendeskGroupIdPublic(),
@@ -47,7 +48,8 @@ export function contactUsService(
     descriptions: Descriptions,
     optionalData: OptionalData,
     questions: Questions,
-    themeQuestions: ThemeQuestions
+    themeQuestions: ThemeQuestions,
+    referer: string
   ) {
     const htmlBody = [];
 
@@ -77,6 +79,13 @@ export function contactUsService(
     htmlBody.push(`<span>[Session ID]</span>`);
     htmlBody.push(`<p>${optionalData.sessionId}</p>`);
 
+    htmlBody.push(`<span>[From page]</span>`);
+    if (referer) {
+      htmlBody.push(`<p>${referer}</p>`);
+    } else {
+      htmlBody.push(`<p>Unable to capture referer</p>`);
+    }
+
     htmlBody.push(`<span>[User Agent]</span>`);
     htmlBody.push(`<p>${optionalData.userAgent}</p>`);
 

src/components/contact-us/further-information/_account-creation-further-information.njk

@@ -6,6 +6,7 @@
 
 <input type="hidden" name="_csrf" value="{{csrfToken}}"/>
 <input type="hidden" name="theme" value="{{theme}}"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
     {{ govukRadios({
         idPrefix: "account-creation",

src/components/contact-us/further-information/_signing-in-further-information.njk

@@ -6,6 +6,7 @@
 
 <input type="hidden" name="_csrf" value="{{csrfToken}}"/>
 <input type="hidden" name="theme" value="{{theme}}"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
     {{ govukRadios({
         idPrefix: "signing-in",

src/components/contact-us/index-public-contact-us.njk

@@ -7,7 +7,7 @@
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
 {% set showBack = true %}
-{% set hrefBack = 'support' %}
+{% set hrefBack = fromPage %}
 {% set pageTitleName = 'pages.contactUsPublic.title' | translate %}
 
 {% block content %}
@@ -34,6 +34,7 @@
 <form action="/contact-us" method="post" novalidate>
 
 <input type="hidden" name="_csrf" value="{{csrfToken}}"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
     {{ govukRadios({
         idPrefix: "contact-us",

src/components/contact-us/questions/_account-creation-problem-questions.njk

@@ -9,6 +9,7 @@
 <input type="hidden" name="subtheme" value="{{subtheme}}"/>
 <input type="hidden" name="backurl" value="{{backurl}}"/>
 <input type="hidden" name="formType" value="accountCreationProblem"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
 {{ govukTextarea({
     label: {

src/components/contact-us/questions/_account-not-found-questions.njk

@@ -9,6 +9,7 @@
 <input type="hidden" name="subtheme" value="{{subtheme}}"/>
 <input type="hidden" name="backurl" value="{{backurl}}"/>
 <input type="hidden" name="formType" value="accountNotFound"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
 {{ govukTextarea({
     label: {

src/components/contact-us/questions/_another-problem-questions.njk

@@ -9,6 +9,7 @@
 <input type="hidden" name="subtheme" value="{{subtheme}}"/>
 <input type="hidden" name="backurl" value="{{backurl}}"/>
 <input type="hidden" name="formType" value="accountProblem"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
 {{ govukTextarea({
     label: {

src/components/contact-us/questions/_email-subscriptions-questions.njk

@@ -8,6 +8,7 @@
 <input type="hidden" name="theme" value="{{theme}}"/>
 <input type="hidden" name="backurl" value="{{backurl}}"/>
 <input type="hidden" name="formType" value="emailSubscription"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
 {{ govukTextarea({
     label: {

src/components/contact-us/questions/_forgotten-password-questions.njk

@@ -9,6 +9,7 @@
 <input type="hidden" name="subtheme" value="{{subtheme}}"/>
 <input type="hidden" name="backurl" value="{{backurl}}"/>
 <input type="hidden" name="formType" value="forgottenPassword"/>
+<input type="hidden" name="fromPage" value="{{fromPage}}"/>
 
 {{ govukTextarea({
     label: {