From cc062eeeb8f217e75d5bb16d053c8eebc08d5243 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Sun, 30 Jul 2017 22:48:52 +0200
Subject: [PATCH] Check against content type so we don't try to decode HTML or
 XML etc etc

---
 src/JsonDecodeMiddleware.php       | 10 ++++
 src/Options.php                    |  9 ++++
 tests/JsonDecodeMiddlewareTest.php | 75 +++++++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/Options.php

diff --git a/src/JsonDecodeMiddleware.php b/src/JsonDecodeMiddleware.php
index 592665e..9c2c6a7 100644
--- a/src/JsonDecodeMiddleware.php
+++ b/src/JsonDecodeMiddleware.php
@@ -48,6 +48,16 @@ public function post(
             return resolve($response);
         }
 
+        if (!isset($options[self::class]) &&
+            $response->getHeaderLine('Content-Type') !== 'application/json') {
+            return resolve($response);
+        }
+
+        if (isset($options[self::class][Options::CONTENT_TYPE]) &&
+            $response->getHeaderLine('Content-Type') !== $options[self::class][Options::CONTENT_TYPE]) {
+            return resolve($response);
+        }
+
         $body = (string)$response->getBody();
         if ($body === '') {
             $stream = new BufferStream(0);
diff --git a/src/Options.php b/src/Options.php
new file mode 100644
index 0000000..3d02f2a
--- /dev/null
+++ b/src/Options.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Middleware\Json;
+
+final class Options
+{
+    const CONTENT_TYPE = 'CONTENT_TYPE';
+    const NO_CONTENT_TYPE_CHECK = 'NO_CONTENT_TYPE_CHECK';
+}
diff --git a/tests/JsonDecodeMiddlewareTest.php b/tests/JsonDecodeMiddlewareTest.php
index 5008268..fa829db 100644
--- a/tests/JsonDecodeMiddlewareTest.php
+++ b/tests/JsonDecodeMiddlewareTest.php
@@ -4,6 +4,7 @@
 
 use ApiClients\Middleware\Json\JsonStream;
 use ApiClients\Middleware\Json\JsonDecodeMiddleware;
+use ApiClients\Middleware\Json\Options;
 use ApiClients\Tools\Json\JsonDecodeService;
 use ApiClients\Tools\TestUtilities\TestCase;
 use Clue\React\Buzz\Message\ReadableBodyStream;
@@ -19,7 +20,7 @@ public function testPost()
         $loop = Factory::create();
         $service = new JsonDecodeService($loop);
         $middleware = new JsonDecodeMiddleware($service);
-        $response = new Response(200, [], '[]');
+        $response = new Response(200, ['Content-Type' => 'application/json'], '[]');
 
         $body = await(
             $middleware->post($response, 'abc'),
@@ -34,6 +35,78 @@ public function testPost()
         );
     }
 
+    public function testPostNoContentType()
+    {
+        $loop = Factory::create();
+        $service = new JsonDecodeService($loop);
+        $middleware = new JsonDecodeMiddleware($service);
+        $response = new Response(200, [], '[]');
+
+        self::assertSame(
+            $response,
+            await(
+                $middleware->post($response, 'abc'),
+                $loop
+            )
+        );
+    }
+
+    public function testPostNoContentTypeCheck()
+    {
+        $loop = Factory::create();
+        $service = new JsonDecodeService($loop);
+        $middleware = new JsonDecodeMiddleware($service);
+        $response = new Response(200, [], '[]');
+
+        $body = await(
+            $middleware->post(
+                $response,
+                'abc',
+                [
+                    JsonDecodeMiddleware::class => [
+                        Options::NO_CONTENT_TYPE_CHECK => true,
+                    ],
+                ]
+            ),
+            $loop
+        )->getBody();
+
+        self::assertInstanceOf(JsonStream::class, $body);
+
+        self::assertSame(
+            [],
+            $body->getJson()
+        );
+    }
+
+    public function testPostCustomTYpe()
+    {
+        $loop = Factory::create();
+        $service = new JsonDecodeService($loop);
+        $middleware = new JsonDecodeMiddleware($service);
+        $response = new Response(200, ['Content-Type' => 'custom/type'], '[]');
+
+        $body = await(
+            $middleware->post(
+                $response,
+                'abc',
+                [
+                    JsonDecodeMiddleware::class => [
+                        Options::CONTENT_TYPE => 'custom/type',
+                    ],
+                ]
+            ),
+            $loop
+        )->getBody();
+
+        self::assertInstanceOf(JsonStream::class, $body);
+
+        self::assertSame(
+            [],
+            $body->getJson()
+        );
+    }
+
     public function testPostNoJson()
     {
         $loop = Factory::create();