diff --git a/app/config/FrontendAppConfig.scala b/app/config/FrontendAppConfig.scala index c00797da..dfd48522 100644 --- a/app/config/FrontendAppConfig.scala +++ b/app/config/FrontendAppConfig.scala @@ -17,10 +17,7 @@ package config import com.google.inject.{Inject, Singleton} -import controllers.routes import play.api.Configuration -import play.api.i18n.Lang -import play.api.mvc.Call import uk.gov.hmrc.play.bootstrap.config.ServicesConfig @Singleton diff --git a/app/controllers/actions/AuthenticatedIdentifierAction.scala b/app/controllers/actions/AuthenticatedIdentifierAction.scala index e46613f4..c75639a9 100644 --- a/app/controllers/actions/AuthenticatedIdentifierAction.scala +++ b/app/controllers/actions/AuthenticatedIdentifierAction.scala @@ -18,7 +18,6 @@ package controllers.actions import com.google.inject.Inject import config.FrontendAppConfig -import controllers.routes._ import models.requests.IdentifierRequest import play.api.Logging import play.api.mvc.Results._ diff --git a/app/controllers/actions/DataRequiredAction.scala b/app/controllers/actions/DataRequiredAction.scala index 8c227bc5..43f30056 100644 --- a/app/controllers/actions/DataRequiredAction.scala +++ b/app/controllers/actions/DataRequiredAction.scala @@ -16,18 +16,17 @@ package controllers.actions -import controllers.routes import controllers.confirmation.{routes => confRoutes} +import controllers.routes import models.NormalMode - -import javax.inject.Inject import models.requests.{DataRequest, OptionalDataRequest} -import navigation.{AuthenticatedNavigator, Navigator} +import navigation.AuthenticatedNavigator import pages.SubmittedClaim import pages.authenticated.Submission import play.api.mvc.Results.Redirect import play.api.mvc.{ActionRefiner, Result} +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class DataRequiredActionImpl @Inject()(navigator: AuthenticatedNavigator) diff --git a/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala b/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala index c4ff1da2..b10714d7 100644 --- a/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala +++ b/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala @@ -17,9 +17,7 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} -import controllers.routes.{SessionExpiredController, _} - -import javax.inject.Inject +import controllers.routes._ import models.TaxYearSelection.CurrentYear import models.{Address, FlatRateExpenseAmounts, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.{TaxYearSelectionPage, YourEmployerPage} @@ -27,11 +25,11 @@ import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREAmounts, FR import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationCurrentAndPreviousYearsView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationCurrentAndPreviousYearsController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala b/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala index f3f06fb2..1206872e 100644 --- a/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala +++ b/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala @@ -18,8 +18,6 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} import controllers.routes._ - -import javax.inject.Inject import models.TaxYearSelection.CurrentYear import models.{Address, FlatRateExpenseAmounts, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.YourEmployerPage @@ -27,11 +25,11 @@ import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREAmounts, FR import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationCurrentYearOnlyView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationCurrentYearOnlyController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationMergeJourneyController.scala b/app/controllers/confirmation/ConfirmationMergeJourneyController.scala index 80bc1002..e477951b 100644 --- a/app/controllers/confirmation/ConfirmationMergeJourneyController.scala +++ b/app/controllers/confirmation/ConfirmationMergeJourneyController.scala @@ -21,16 +21,15 @@ import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, D import controllers.routes.SessionExpiredController import models.NormalMode import navigation.Navigator -import pages.{ClaimAmountAndAnyDeductions, FREResponse} import pages.authenticated.{TaxYearSelectionPage, YourEmployerPage} import pages.confirmation.ConfirmationMergeJourneyPage +import pages.{ClaimAmountAndAnyDeductions, FREResponse} import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationMergeJourneyView import javax.inject.{Inject, Named} -import scala.concurrent.Future class ConfirmationMergeJourneyController @Inject()( override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala b/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala index c11a1044..0126f275 100644 --- a/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala +++ b/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala @@ -17,20 +17,18 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} -import controllers.routes.{SessionExpiredController, _} - -import javax.inject.Inject +import controllers.routes._ import models.{Address, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.TaxYearSelectionPage import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREResponse} import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationPreviousYearsOnlyView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationPreviousYearsOnlyController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/views/LayoutProvider.scala b/app/views/LayoutProvider.scala index 9417d9fa..cdb8a323 100644 --- a/app/views/LayoutProvider.scala +++ b/app/views/LayoutProvider.scala @@ -22,7 +22,6 @@ import play.api.i18n.Messages import play.api.mvc.Request import play.twirl.api.{Html, HtmlFormat} import uk.gov.hmrc.hmrcfrontend.views.viewmodels.hmrcstandardpage.ServiceURLs -import uk.gov.hmrc.play.http.HeaderCarrierConverter import uk.gov.hmrc.sca.services.WrapperService import views.html.playComponents.{AdditionalScript, HeadBlock} @@ -83,6 +82,7 @@ class NewLayoutProvider @Inject()(wrapperService: WrapperService, pageTitle = Some(s"$pageTitle - ${messages(serviceNameKeyOverride.getOrElse("service.name"))} - GOV.UK"), serviceNameKey = Some(serviceNameKeyOverride.getOrElse("service.name")), serviceURLs = ServiceURLs( + signOutUrl = Some(controllers.authenticated.routes.SignOutController.signOut.url), serviceUrl = Some(serviceUrlOverride.getOrElse(controllers.routes.IndexController.start.url)) ), timeOutUrl = Some(controllers.authenticated.routes.SignOutController.signOut.url), @@ -92,6 +92,6 @@ class NewLayoutProvider @Inject()(wrapperService: WrapperService, styleSheets = stylesheets.toSeq :+ headBlock(), fullWidth = false, hideMenuBar = hideAccountMenu, - )(messages, HeaderCarrierConverter.fromRequest(request), request) + )(messages, request) } } diff --git a/app/views/authenticated/CheckYourAnswersView.scala.html b/app/views/authenticated/CheckYourAnswersView.scala.html index 09fb26f3..31135d39 100644 --- a/app/views/authenticated/CheckYourAnswersView.scala.html +++ b/app/views/authenticated/CheckYourAnswersView.scala.html @@ -52,7 +52,7 @@

@messages(s"checkYourAnswers.${checkYourAnswersText.
- >@messages("checkYourAnswers.warning") + @messages("checkYourAnswers.warning") @messages("checkYourAnswers.prosecuted")
diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml deleted file mode 100644 index b6076f0f..00000000 --- a/conf/application-json-logger.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/conf/application.conf b/conf/application.conf index 38fb4276..f53de3fd 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -27,6 +27,7 @@ play.http.filters = "config.Filters" # ~~~~ # Additional play modules can be added here play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientModule" +play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientV2Module" play.modules.enabled += "uk.gov.hmrc.play.bootstrap.AuthModule" play.modules.enabled += "config.Module" play.modules.enabled += "uk.gov.hmrc.mongo.play.PlayMongoModule" @@ -212,12 +213,7 @@ feature-switch { sca-wrapper { host = "http://localhost:9334" service.url = "http://localhost:9334/employee-expenses" - feedback-service-name = "employee-expenses-frontend" exit-survey-origin = "employee-expenses" - accessibility-statement { - referrer.url = "/employee-expenses" - redirect.url = "employee-expenses" - } service-name { messages-key = service.name } @@ -227,16 +223,10 @@ sca-wrapper { timeout = 900 countdown = 120 } - signout { - url = "/employee-expenses/sign-out" - alternative-url = null - } services { tracking-frontend.url = "http://localhost:9100" feedback-frontend.url = "http://localhost:9514" - contact-frontend.url = "http://localhost:9250" pertax-frontend.url = "http://localhost:9232" - accessibility-statement-frontend.url = "http://localhost:12346" single-customer-account-wrapper-data.url = "http://localhost:8422" } banners { diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index ede2633b..b043c65a 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -2,15 +2,15 @@ import sbt.* object AppDependencies { - private val mongoVersion = "1.7.0" - private val bootstrapVersion = "8.4.0" + private val mongoVersion = "2.1.0" + private val bootstrapVersion = "9.0.0" val compile: Seq[ModuleID] = Seq( play.sbt.PlayImport.ws, "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-30" % mongoVersion, "uk.gov.hmrc" %% "play-conditional-form-mapping-play-30" % "2.0.0", - "uk.gov.hmrc" %% "tax-year" % "4.0.0", - "uk.gov.hmrc" %% "sca-wrapper-play-30" % "1.3.0" + "uk.gov.hmrc" %% "tax-year" % "5.0.0", + "uk.gov.hmrc" %% "sca-wrapper-play-30" % "1.9.0" ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 34e84663..0e1c2b18 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,6 +4,6 @@ resolvers += Resolver.typesafeRepo("releases") addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.22.0") addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.5.0") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0" exclude("org.scala-lang.modules", "scala-xml_2.12")) -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12") diff --git a/test/views/confirmation/ConfirmationCurrentAndPreviousYearsViewSpec.scala b/test/views/confirmation/ConfirmationCurrentAndPreviousYearsViewSpec.scala index 2c37c40b..6e2f12a8 100644 --- a/test/views/confirmation/ConfirmationCurrentAndPreviousYearsViewSpec.scala +++ b/test/views/confirmation/ConfirmationCurrentAndPreviousYearsViewSpec.scala @@ -142,21 +142,21 @@ class ConfirmationCurrentAndPreviousYearsViewSpec extends ViewBehaviours { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRESomeYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FREAllYearsAllAmountsSameAsClaimAmount'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FREAllYearsAllAmountsSameAsClaimAmount)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FRENoYears'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRENoYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" } "YourAddress" must { diff --git a/test/views/confirmation/ConfirmationCurrentYearOnlyViewSpec.scala b/test/views/confirmation/ConfirmationCurrentYearOnlyViewSpec.scala index f5d86d28..ccc94b59 100644 --- a/test/views/confirmation/ConfirmationCurrentYearOnlyViewSpec.scala +++ b/test/views/confirmation/ConfirmationCurrentYearOnlyViewSpec.scala @@ -166,21 +166,21 @@ class ConfirmationCurrentYearOnlyViewSpec extends ViewBehaviours { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRESomeYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FREAllYearsAllAmountsSameAsClaimAmount'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FREAllYearsAllAmountsSameAsClaimAmount)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FRENoYears'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRENoYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" } "YourAddress" must { diff --git a/test/views/confirmation/ConfirmationPreviousYearsOnlyViewSpec.scala b/test/views/confirmation/ConfirmationPreviousYearsOnlyViewSpec.scala index e353693c..205d0af5 100644 --- a/test/views/confirmation/ConfirmationPreviousYearsOnlyViewSpec.scala +++ b/test/views/confirmation/ConfirmationPreviousYearsOnlyViewSpec.scala @@ -100,21 +100,21 @@ class ConfirmationPreviousYearsOnlyViewSpec extends ViewBehaviours { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRESomeYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FREAllYearsAllAmountsSameAsClaimAmount'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FREAllYearsAllAmountsSameAsClaimAmount)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim changed - Claim for your work uniform and tools - GOV.UK" } "display correct title when freResponse is 'FRENoYears'" in { val doc = asDocument(applyView(freResponse = FlatRateExpenseOptions.FRENoYears)(fakeRequest, messages)) - doc.getElementsByTag("title").text mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" + doc.title mustBe "Claim complete for uniform, work clothing and tools - Claim for your work uniform and tools - GOV.UK" } "YourAddress" must {