Merge pull request #284 from UKHomeOffice/DRTII-1541-New-users-gettin…

…g-404-when-trying-to-access-port Drtii 1541 new users getting 404 when trying to access port
UKHomeOffice · Jul 22, 2024 · 7b55627 · 7b55627
2 parents 9454d33 + c5c7c79
commit 7b55627
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import sbt.Keys.resolvers
 
-lazy val drtLibVersion = "v843"
+lazy val drtLibVersion = "v858"
 lazy val drtCiriumVersion = "203"
 lazy val akkaHttpVersion = "10.5.3"
 lazy val akkaVersion = "2.8.5"

diff --git a/react/src/services/ApiClient.ts b/react/src/services/ApiClient.ts
@@ -9,7 +9,7 @@ export default class ApiClient implements IApiClient {
   public static userEndPoint = "/api/user"
   public static userTrackingEndPoint = "/api/track-user"
   public static configEndPoint = "/api/config"
-  public static logoutEndPoint = "/oauth/logout"
+  public static logoutEndPoint = "/oauth2/sign_out"
   public static alertsEndPoint = "/api/alerts"
   public static healthChecks = "/api/health-checks"
   public static healthCheckAlarmStatuses = "/api/health-checks/alarm-statuses"

diff --git a/src/main/scala/uk/gov/homeoffice/drt/routes/IndexRoute.scala b/src/main/scala/uk/gov/homeoffice/drt/routes/IndexRoute.scala
@@ -42,7 +42,7 @@ case class IndexRoute(urls: Urls, indexResource: Route) {
             val user = User.fromRoles("", rolesStr)
             if (user.accessiblePorts.contains(portCode)) {
               val portLogoutUrl = urls.logoutUrlForPort(portCode)
-              log.info(s"Redirecting back to $portCode ($portLogoutUrl)")
+              log.info(s"DRT v2's user session is out of date. Redirecting user to log out of port $portCode ($portLogoutUrl)")
               redirect(portLogoutUrl, StatusCodes.TemporaryRedirect)
             } else {
               log.info(s"Redirecting to root url as originating $portCode is not available to user")

diff --git a/src/test/scala/uk/gov/homeoffice/drt/routes/IndexRouteSpec.scala b/src/test/scala/uk/gov/homeoffice/drt/routes/IndexRouteSpec.scala
@@ -52,7 +52,7 @@ class IndexRouteSpec extends Specification with Specs2RouteTest {
     Get("/?fromPort=lhr") ~>
       RawHeader("X-Forwarded-Groups", Seq(BorderForceStaff.name, LHR.name).mkString(",")) ~> routes ~> check {
         val isTempRedirected = status shouldEqual StatusCodes.TemporaryRedirect
-        val isLhrLogoutUrl = header("Location") shouldEqual Option(Location(s"$lhrUrl/oauth/logout?redirect=$lhrUrl"))
+        val isLhrLogoutUrl = header("Location") shouldEqual Option(Location(s"$lhrUrl/oauth2/sign_out?redirect=$lhrUrl"))
         isTempRedirected && isLhrLogoutUrl
       }
   }