Merge pull request #1848 from guardian/revert-1836-filter-out-invalid-topics-new

Revert "Filter out invalid topics from registration requests"

Author: vlbee

common/src/main/scala/models/Registration.scala

@@ -21,17 +21,17 @@ object Registration {
           val n = (v \ "name").asOpt[String].getOrElse("unknown")
           s"$t (id=$n)"
         }
-
-        val topicsArray = (json \ "topics").asOpt[JsArray].getOrElse(JsArray())
-        val (validTopics, invalidTopics) = topicsArray.value.partition(_.validate[Topic].isSuccess)
-
-        if (invalidTopics.nonEmpty) {
-          MDC.put("invalidTopics", invalidTopics.map(topicSummary).mkString(", "))
-          MDC.put("validTopics", validTopics.map(topicSummary).mkString(", "))
+        val all = (json \ "topics").asOpt[JsArray].toSeq.flatMap(_.value.map(topicSummary))
+        val invalid = (json \ "topics").asOpt[JsArray].toSeq.flatMap { arr =>
+          arr.value.flatMap { v =>
+            if (v.validate[Topic].isError) Some(topicSummary(v)) else None
+          }
         }
-
-        val filteredJson = json.as[JsObject] + ("topics" -> JsArray(validTopics))
-        base.reads(filteredJson)
+        if (invalid.nonEmpty) {
+          MDC.put("invalidTopics", invalid.mkString(", "))
+          if (all.nonEmpty) MDC.put("allTopics", all.mkString(", "))
+        }
+        base.reads(json)
       },
       base
     )

common/src/test/scala/models/RegistrationSpec.scala

@@ -14,7 +14,7 @@ import registration.services._
 import registration.services.topic.TopicValidator
 
 import scala.concurrent.{ExecutionContext, Future}
-import org.slf4j.{Logger, LoggerFactory, MDC}
+import org.slf4j.{Logger, LoggerFactory}
 import play.api.http.HttpEntity
 import providers.ProviderError
 
@@ -62,18 +62,7 @@ final class Main(
     registerWithConverter(legacyRegistrationConverter)
 
   def register: Action[Registration] = actionWithTimeout(parse.json[Registration]) { request: Request[Registration] =>
-    Option(MDC.get("invalidTopics")).foreach { invalidTopics =>
-      val validTopics = Option(MDC.get("validTopics")).getOrElse("")
-      val userAgent = request.headers.get("User-Agent").getOrElse("unknown")
-      val deviceToken = request.body.deviceToken
-      logger.warn(s"Request contains invalid topic type(s): [$invalidTopics]. Filtering them out. Keeping: [$validTopics]. Device token: $deviceToken. User agent: $userAgent")
-      MDC.remove("invalidTopics")
-      MDC.remove("validTopics")
-    }
-    if (request.body.topics.isEmpty)
-      Future.successful(BadRequest("Request contains no valid topics"))
-    else
-      registerCommon(request.body).map(processResponse(_))
+    registerCommon(request.body).map(processResponse(_))
   }
 
   private def registerWithConverter[T](converter: RegistrationConverter[T])(implicit format: Format[T]): Action[T] = actionWithTimeout(parse.json[T]) { request =>