Merge pull request #32 from hmrc/DC-3250

DC-3250: adding sent to allowed parameters
hmrc · Mar 11, 2021 · c6d5465 · c6d5465
2 parents b9e0f90 + 9cf9247
commit c6d5465
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/app/controllers/ConversationInboxController.scala b/app/controllers/ConversationInboxController.scala
@@ -50,7 +50,7 @@ class ConversationInboxController @Inject()(
     customerEnrolments: Option[List[CustomerEnrolment]],
     tags: Option[List[Tag]]): Action[AnyContent] = Action.async { implicit request =>
     implicit val hc: HeaderCarrier = HeaderCarrierConverter.fromRequest(request)
-    validateQueryParameters(request.queryString, "enrolment", "enrolmentKey", "tag") match {
+    validateQueryParameters(request.queryString, "enrolment", "enrolmentKey", "tag", "sent") match {
       case Left(e) => Future.successful(BadRequest(e.getMessage))
       case _ =>
         authorised() {

diff --git a/build.sbt b/build.sbt
@@ -30,10 +30,12 @@ val silencerVersion = "1.7.0"
 lazy val externalServices = List(
   ExternalService("DATASTREAM"),
   ExternalService("AUTH"),
+  ExternalService("AUTH_LOGIN_API"),
   ExternalService("IDENTITY_VERIFICATION"),
   ExternalService("USER_DETAILS"),
   ExternalService("SECURE_MESSAGE_FRONTEND"),
-  ExternalService("SECURE_MESSAGE")
+  ExternalService("SECURE_MESSAGE"),
+  ExternalService("EMAIL")
 )
 
 lazy val wartremoverSettings =

diff --git a/it/ConversationInboxPartialISpec.scala b/it/ConversationInboxPartialISpec.scala
@@ -38,7 +38,7 @@ import scala.concurrent.{ ExecutionContext, Future }
 @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements"))
 class ConversationInboxPartialISpec extends PlaySpec with ServiceSpec with MockitoSugar with BeforeAndAfterEach {
 
-  override def externalServices: Seq[String] = Seq("auth-login-api")
+  override def externalServices: Seq[String] = Seq.empty
 
   private val mockSecureMessageConnector = mock[SecureMessageConnector]
 
@@ -97,7 +97,8 @@ class ConversationInboxPartialISpec extends PlaySpec with ServiceSpec with Mocki
   }
 
   object AuthUtil {
-    lazy val ggAuthPort: Int = externalServicePorts("auth-login-api")
+
+    lazy val ggAuthPort: Int = 8585
 
     implicit val deserialiser: Reads[GatewayToken] = Json.reads[GatewayToken]
 

diff --git a/it/ConversationMessagesPartialISpec.scala b/it/ConversationMessagesPartialISpec.scala
@@ -35,7 +35,7 @@ import play.api.http.Status.OK
 @SuppressWarnings(Array("org.wartremover.warts.All"))
 class ConversationMessagesPartialISpec extends PlaySpec with ServiceSpec with MockitoSugar with BeforeAndAfterEach {
 
-  override def externalServices: Seq[String] = Seq("auth-login-api")
+  override def externalServices: Seq[String] = Seq.empty
 
   private val mockSecureMessageConnector = mock[SecureMessageConnector]
 
@@ -92,7 +92,7 @@ class ConversationMessagesPartialISpec extends PlaySpec with ServiceSpec with Mo
       .post(payload)
       .futureValue
 
-    lazy val ggAuthPort: Int = externalServicePorts("auth-login-api")
+    lazy val ggAuthPort: Int = 8585
 
     implicit val deserialiser: Reads[GatewayToken] = Json.reads[GatewayToken]
 

diff --git a/it/ConversationPartialISpec.scala b/it/ConversationPartialISpec.scala
@@ -27,8 +27,8 @@ import play.api.http.Status.OK
 
 @SuppressWarnings(Array("org.wartremover.warts.All"))
 class ConversationPartialISpec extends PlaySpec with ServiceSpec with MockitoSugar with BeforeAndAfterEach {
-  override def externalServices: Seq[String] = Seq("auth-login-api", "secure-message")
-  val secureMessagePort = externalServicePorts("secure-message")
+  override def externalServices: Seq[String] = Seq.empty
+  val secureMessagePort: Int = 9051
 
   override protected def beforeEach() = {
     (wsClient
@@ -85,7 +85,7 @@ class ConversationPartialISpec extends PlaySpec with ServiceSpec with MockitoSug
       .post(payload)
       .futureValue
 
-    lazy val ggAuthPort: Int = externalServicePorts("auth-login-api")
+    lazy val ggAuthPort: Int = 8585
 
     implicit val deserialiser: Reads[GatewayToken] = Json.reads[GatewayToken]