From 137ea1c47d052bfe32fdc81b615e7e00c150a05c Mon Sep 17 00:00:00 2001 From: satyajosyula2020 Date: Mon, 2 Mar 2026 09:20:25 +0000 Subject: [PATCH 1/4] DDCNL-11640 : Update sca-wrapper version to apply language filter required to persist lang between pega and tes --- app/uk/gov/hmrc/tai/config/Filters.scala | 7 ++++--- project/AppDependencies.scala | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/uk/gov/hmrc/tai/config/Filters.scala b/app/uk/gov/hmrc/tai/config/Filters.scala index 6b7371834..0ad349002 100644 --- a/app/uk/gov/hmrc/tai/config/Filters.scala +++ b/app/uk/gov/hmrc/tai/config/Filters.scala @@ -18,7 +18,7 @@ package uk.gov.hmrc.tai.config import play.api.http.{EnabledFilters, HttpFilters} import play.api.mvc.EssentialFilter -import uk.gov.hmrc.sca.filters.WrapperDataFilter +import uk.gov.hmrc.sca.filters.{LangQueryParamFilter, WrapperDataFilter} import uk.gov.hmrc.tai.filters.PegaRedirectFilter import javax.inject.{Inject, Singleton} @@ -27,9 +27,10 @@ import javax.inject.{Inject, Singleton} class Filters @Inject() ( defaultFilters: EnabledFilters, wrapperDataFilter: WrapperDataFilter, - pegaRedirectFilter: PegaRedirectFilter + pegaRedirectFilter: PegaRedirectFilter, + langQueryParamFilter: LangQueryParamFilter ) extends HttpFilters { override val filters: Seq[EssentialFilter] = - defaultFilters.filters ++ Some(wrapperDataFilter) ++ Some(pegaRedirectFilter) + defaultFilters.filters ++ Seq(wrapperDataFilter, langQueryParamFilter, pegaRedirectFilter) } diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index ebb3060a5..b1cf7f527 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -3,7 +3,7 @@ import sbt.* private object AppDependencies { private val playVersion = "play-30" - private val scaWrapperVersion = "4.8.0" + private val scaWrapperVersion = "4.10.0" private val mongoFeatureToggleVersion = "2.4.0" val compile: Seq[ModuleID] = Seq( From cb42e7be87e827985e6010a587073529a0d5567b Mon Sep 17 00:00:00 2001 From: satyajosyula2020 Date: Wed, 11 Mar 2026 18:34:33 +0000 Subject: [PATCH 2/4] Update AppDependencies.scala --- project/AppDependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index b1cf7f527..7bde3d56e 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -3,7 +3,7 @@ import sbt.* private object AppDependencies { private val playVersion = "play-30" - private val scaWrapperVersion = "4.10.0" + private val scaWrapperVersion = "4.13.0" private val mongoFeatureToggleVersion = "2.4.0" val compile: Seq[ModuleID] = Seq( From 03f68e49fea8790ae30abfc1132b53b37587bbbb Mon Sep 17 00:00:00 2001 From: satyajosyula2020 Date: Wed, 11 Mar 2026 19:06:46 +0000 Subject: [PATCH 3/4] Updated TrustedHelper with the one from sca-wrapper --- app/controllers/auth/AuthedUser.scala | 2 +- app/uk/gov/hmrc/tai/config/Filters.scala | 7 +++---- test/builders/UserBuilder.scala | 2 +- test/controllers/auth/AuthRetrievalsSpec.scala | 2 +- test/uk/gov/hmrc/tai/filters/PegaRedirectFilterSpec.scala | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/controllers/auth/AuthedUser.scala b/app/controllers/auth/AuthedUser.scala index 0cb9f5a1f..0ee1c3608 100644 --- a/app/controllers/auth/AuthedUser.scala +++ b/app/controllers/auth/AuthedUser.scala @@ -16,8 +16,8 @@ package controllers.auth -import uk.gov.hmrc.auth.core.retrieve.v2.TrustedHelper import uk.gov.hmrc.domain.Nino +import uk.gov.hmrc.sca.models.TrustedHelper final case class AuthedUser( nino: Nino, diff --git a/app/uk/gov/hmrc/tai/config/Filters.scala b/app/uk/gov/hmrc/tai/config/Filters.scala index 0ad349002..6b7371834 100644 --- a/app/uk/gov/hmrc/tai/config/Filters.scala +++ b/app/uk/gov/hmrc/tai/config/Filters.scala @@ -18,7 +18,7 @@ package uk.gov.hmrc.tai.config import play.api.http.{EnabledFilters, HttpFilters} import play.api.mvc.EssentialFilter -import uk.gov.hmrc.sca.filters.{LangQueryParamFilter, WrapperDataFilter} +import uk.gov.hmrc.sca.filters.WrapperDataFilter import uk.gov.hmrc.tai.filters.PegaRedirectFilter import javax.inject.{Inject, Singleton} @@ -27,10 +27,9 @@ import javax.inject.{Inject, Singleton} class Filters @Inject() ( defaultFilters: EnabledFilters, wrapperDataFilter: WrapperDataFilter, - pegaRedirectFilter: PegaRedirectFilter, - langQueryParamFilter: LangQueryParamFilter + pegaRedirectFilter: PegaRedirectFilter ) extends HttpFilters { override val filters: Seq[EssentialFilter] = - defaultFilters.filters ++ Seq(wrapperDataFilter, langQueryParamFilter, pegaRedirectFilter) + defaultFilters.filters ++ Some(wrapperDataFilter) ++ Some(pegaRedirectFilter) } diff --git a/test/builders/UserBuilder.scala b/test/builders/UserBuilder.scala index 2fdf6c1b2..16487a25a 100644 --- a/test/builders/UserBuilder.scala +++ b/test/builders/UserBuilder.scala @@ -17,7 +17,7 @@ package builders import controllers.auth.AuthedUser -import uk.gov.hmrc.auth.core.retrieve.v2.TrustedHelper +import uk.gov.hmrc.sca.models.TrustedHelper import uk.gov.hmrc.domain.{Generator, Nino} object UserBuilder { diff --git a/test/controllers/auth/AuthRetrievalsSpec.scala b/test/controllers/auth/AuthRetrievalsSpec.scala index 589dcb621..10e790326 100644 --- a/test/controllers/auth/AuthRetrievalsSpec.scala +++ b/test/controllers/auth/AuthRetrievalsSpec.scala @@ -38,13 +38,13 @@ import play.api.mvc.* import play.api.test.FakeRequest import play.api.test.Helpers.* import uk.gov.hmrc.auth.core.authorise.Predicate -import uk.gov.hmrc.auth.core.retrieve.v2.TrustedHelper import uk.gov.hmrc.auth.core.retrieve.{Retrieval, ~} import uk.gov.hmrc.auth.core.{Nino as _, *} import uk.gov.hmrc.domain.{Generator, Nino} import uk.gov.hmrc.http.{HeaderCarrier, SessionKeys} import uk.gov.hmrc.sca.models.{PtaMinMenuConfig, WrapperDataResponse} import uk.gov.hmrc.sca.utils.Keys +import uk.gov.hmrc.sca.models.TrustedHelper import utils.BaseSpec import scala.concurrent.{ExecutionContext, Future} diff --git a/test/uk/gov/hmrc/tai/filters/PegaRedirectFilterSpec.scala b/test/uk/gov/hmrc/tai/filters/PegaRedirectFilterSpec.scala index 7010ddbec..9fb9eca66 100644 --- a/test/uk/gov/hmrc/tai/filters/PegaRedirectFilterSpec.scala +++ b/test/uk/gov/hmrc/tai/filters/PegaRedirectFilterSpec.scala @@ -27,9 +27,8 @@ import play.api.test.Helpers.* import scala.concurrent.Future import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.Materializer -import uk.gov.hmrc.auth.core.retrieve.v2.TrustedHelper import uk.gov.hmrc.domain.Generator -import uk.gov.hmrc.sca.models.{PtaMinMenuConfig, WrapperDataResponse} +import uk.gov.hmrc.sca.models.{PtaMinMenuConfig, TrustedHelper, WrapperDataResponse} import uk.gov.hmrc.sca.utils.Keys class PegaRedirectFilterSpec extends PlaySpec { From 8c8c4a02ed85122527ceaa3ff7028964714e46ac Mon Sep 17 00:00:00 2001 From: satyajosyula2020 Date: Wed, 11 Mar 2026 19:28:19 +0000 Subject: [PATCH 4/4] Updated libraries as per pr-bot comments --- project/AppDependencies.scala | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 7bde3d56e..552685f0f 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -4,12 +4,12 @@ import sbt.* private object AppDependencies { private val playVersion = "play-30" private val scaWrapperVersion = "4.13.0" - private val mongoFeatureToggleVersion = "2.4.0" + private val mongoFeatureToggleVersion = "2.5.0" val compile: Seq[ModuleID] = Seq( filters, "org.typelevel" %% "cats-core" % "2.13.0", - "uk.gov.hmrc" %% s"play-conditional-form-mapping-$playVersion" % "3.4.0", + "uk.gov.hmrc" %% s"play-conditional-form-mapping-$playVersion" % "3.5.0", "uk.gov.hmrc" %% s"mongo-feature-toggles-client-$playVersion" % mongoFeatureToggleVersion, "uk.gov.hmrc" %% s"sca-wrapper-$playVersion" % scaWrapperVersion ) diff --git a/project/plugins.sbt b/project/plugins.sbt index cef879226..bfc2dfa93 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.6.0") addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.24.0")