no access token supplied to resource controller results in emptry request body (bshaffer#759)

bshaffer · web-flow · commit bdb91b386813 · 2016-12-22T15:58:29.000-08:00
diff --git a/src/OAuth2/Response.php b/src/OAuth2/Response.php
@@ -176,7 +176,7 @@ public function getResponseBody($format = 'json')
     {
         switch ($format) {
             case 'json':
-                return json_encode($this->parameters);
+                return $this->parameters ? json_encode($this->parameters) : '';
             case 'xml':
                 // this only works for single-level arrays
                 $xml = new \SimpleXMLElement('<response/>');
diff --git a/test/OAuth2/Controller/ResourceControllerTest.php b/test/OAuth2/Controller/ResourceControllerTest.php
@@ -20,6 +20,7 @@ public function testNoAccessToken()
         $this->assertEquals($response->getStatusCode(), 401);
         $this->assertNull($response->getParameter('error'));
         $this->assertNull($response->getParameter('error_description'));
+        $this->assertEquals('', $response->getResponseBody());
     }
 
     public function testMalformedHeader()

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function getResponseBody($format = 'json')`
`176`	`176`	`{`
`177`	`177`	`switch ($format) {`
`178`	`178`	`case 'json':`
`179`		`- return json_encode($this->parameters);`
	`179`	`+ return $this->parameters ? json_encode($this->parameters) : '';`
`180`	`180`	`case 'xml':`
`181`	`181`	`// this only works for single-level arrays`
`182`	`182`	`$xml = new \SimpleXMLElement('<response/>');`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public function testNoAccessToken()`
`20`	`20`	`$this->assertEquals($response->getStatusCode(), 401);`
`21`	`21`	`$this->assertNull($response->getParameter('error'));`
`22`	`22`	`$this->assertNull($response->getParameter('error_description'));`
	`23`	`+ $this->assertEquals('', $response->getResponseBody());`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public function testMalformedHeader()`