Merge pull request #445 from guardian/preferences-proxy-transparent

Forward body bytes rather than attempting to decode to utf-8
guardian · Aug 23, 2024 · 9905b36 · 9905b36
2 parents 2b90812 + 216f0e9
commit 9905b36
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/controllers/PreferencesProxy.scala b/app/controllers/PreferencesProxy.scala
@@ -38,7 +38,9 @@ class PreferencesProxy(
         val responseHeaders = response.headers.view.mapValues(_.head).toMap + (
           "Cache-Control" -> "private, no-cache, no-store, must-revalidate, max-age=0", // do not cache whatsoever
         )
-        new Status(response.status)(response.body).withHeaders(responseHeaders.toSeq: _*)
+        new Status(response.status)(response.bodyAsBytes)
+          .withHeaders(responseHeaders.removed("Content-Type").toSeq: _*)
+          .as(responseHeaders.getOrElse("Content-Type", "application/octet-stream"))
       }
       .recover {
         case _ if config.isDev =>