From 3192cdfe37685f712cbdc730cc95ce1d8ee4e436 Mon Sep 17 00:00:00 2001
From: dominicwest <101722961+dominicwest@users.noreply.github.com>
Date: Tue, 7 May 2024 10:23:59 +0100
Subject: [PATCH 1/2] GAP-2651: Fixing login link for error pages (#215)

---
 src/main/resources/templates/error.html           | 2 +-
 src/main/resources/templates/session-expired.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index 8a14372a..e48e5400 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -16,7 +16,7 @@
             <div class="govuk-grid-column-two-thirds">
                 <h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
                 <p class="govuk-body">
-                    Try again later or return to the <a class="govuk-link" href="/login">login page</a>.
+                    Try again later or return to the <a class="govuk-link" href="/apply/user/v2/login">login page</a>.
                 </p>
             </div>
         </div>
diff --git a/src/main/resources/templates/session-expired.html b/src/main/resources/templates/session-expired.html
index f98de3b1..69cfa27c 100644
--- a/src/main/resources/templates/session-expired.html
+++ b/src/main/resources/templates/session-expired.html
@@ -16,7 +16,7 @@
             <div class="govuk-grid-column-two-thirds">
                 <h1 class="govuk-heading-l">Sorry, your session has expired</h1>
                 <p class="govuk-body">
-                    Return to the <a class="govuk-link" href="/login">login page</a> and try again.
+                    Return to the <a class="govuk-link" href="/apply/user/v2/login">login page</a> and try again.
                 </p>
             </div>
         </div>

From 4102abe98f7a86107cf0e140c0beec674dcfee45 Mon Sep 17 00:00:00 2001
From: jgunnCO <135321532+jgunnCO@users.noreply.github.com>
Date: Tue, 7 May 2024 10:25:32 +0100
Subject: [PATCH 2/2] fix token deletion on logout (#213)

---
 .../service/user/OneLoginUserService.java        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/gov/cabinetoffice/gapuserservice/service/user/OneLoginUserService.java b/src/main/java/gov/cabinetoffice/gapuserservice/service/user/OneLoginUserService.java
index 55029d67..d67bd5a1 100644
--- a/src/main/java/gov/cabinetoffice/gapuserservice/service/user/OneLoginUserService.java
+++ b/src/main/java/gov/cabinetoffice/gapuserservice/service/user/OneLoginUserService.java
@@ -61,6 +61,9 @@ public class OneLoginUserService {
     @Value("${jwt.cookie-name}")
     public String userServiceCookieName;
 
+    @Value("${jwt.cookie-domain}")
+    public String userServiceCookieDomain;
+
     @Value("${admin-backend}")
     private String adminBackend;
 
@@ -369,21 +372,10 @@ public void invalidateUserJwt(final Cookie customJWTCookie, final HttpServletRes
                 new Cookie(userServiceCookieName, null),
                 Boolean.TRUE,
                 Boolean.TRUE,
-                null
+                userServiceCookieDomain
         );
         userTokenCookie.setMaxAge(0);
         response.addCookie(userTokenCookie);
-
-        final String authenticationCookieDomain = Objects.equals(this.configProperties.getProfile(), "LOCAL") ? "localhost" : "cabinetoffice.gov.uk";
-
-        final Cookie thirdPartyAuthToken = WebUtil.buildCookie(
-                new Cookie(authenticationProvider.getTokenCookie(), null),
-                Boolean.TRUE,
-                Boolean.TRUE,
-                authenticationCookieDomain
-        );
-        thirdPartyAuthToken.setMaxAge(0);
-        response.addCookie(thirdPartyAuthToken);
     }
 
     public void validateRoles(List<Role> userRoles, String payloadRoles) {