Merge pull request #25 from chadicus/bug/content-type

Ensure text/html content type when rendering views
chadicus · May 22, 2016 · 0d9a163 · 0d9a163
2 parents f5188d7 + 2f1c264
commit 0d9a163
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/Authorize.php b/src/Authorize.php
@@ -78,7 +78,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         if (empty($authorized)) {
             $response = Http\ResponseBridge::fromOAuth2($oauth2Response);
             $this->view->render($response, $this->template, ['client_id' => $oauth2Request->query('client_id', false)]);
-            return $response;
+            return $response->withHeader('Content-Type', 'text/html');
         }
 
         $this->server->handleAuthorizeRequest($oauth2Request, $oauth2Response, $authorized === 'yes');

diff --git a/src/ReceiveCode.php b/src/ReceiveCode.php
@@ -57,6 +57,6 @@ public function __construct($view, $template = '/receive-code.phtml')
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $arguments = [])
     {
         $this->view->render($response, $this->template, ['code' => $request->getParam('code')]);
-        return $response;
+        return $response->withHeader('Content-Type', 'text/html');
     }
 }
diff --git a/tests/AuthorizeTest.php b/tests/AuthorizeTest.php
@@ -199,6 +199,7 @@ public function invokeEmptyAuthorized()
 
         $expected = <<<HTML
 HTTP/1.1 200 OK
+Content-Type: text/html
 
 <form method="post">
     <label>Do You Authorize testClientId?</label><br />

diff --git a/tests/ReceiveCodeTest.php b/tests/ReceiveCodeTest.php
@@ -70,6 +70,7 @@ public function invoke()
 
         $expected = <<<HTML
 HTTP/1.1 200 OK
+Content-Type: text/html
 
 <h2>The authorization code is {$code}</h2>