From 603d16a851282cc32308cae69bdae02fdadc3deb Mon Sep 17 00:00:00 2001
From: Mudi Ugbowanko <mudi.ugbowanko@mendeley.com>
Date: Mon, 18 Aug 2014 18:31:47 +0100
Subject: [PATCH] Access exchange action expects json encoded auth code

---
 src/Controller/Access.php      | 4 ++--
 test/Controller/AccessTest.php | 2 +-
 test/OAuth/GrantFlowTest.php   | 2 +-
 test/OAuth/RefreshFlowTest.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controller/Access.php b/src/Controller/Access.php
index ea46c1f..a89b430 100644
--- a/src/Controller/Access.php
+++ b/src/Controller/Access.php
@@ -96,9 +96,9 @@ public function refreshAction(Request $request) {
     protected function getAuthCode(Request $request) {
         $constraints = ['code' => [new NotBlank]];
 
-        $data = ['code' => $request->request->get('code')];
+        $data = @json_decode($request->getContent(), true);
 
-        $this->validate($constraints, $data);
+        $this->validate($constraints, $data? $data : []);
 
         return $data['code'];
     }
diff --git a/test/Controller/AccessTest.php b/test/Controller/AccessTest.php
index f205d93..023ce99 100644
--- a/test/Controller/AccessTest.php
+++ b/test/Controller/AccessTest.php
@@ -69,7 +69,7 @@ public function testExchangeAction($testCaseLabel, $expectedAuthCode, $expectedC
 
         $client = $this->createClient(['HTTP_X_CLIENT_SECRET' => $expectedClientSecret], $this->app);
         $client->followRedirects(false);
-        $client->request('POST', '/auth/access', $expectedAuthCode? ['code' => $expectedAuthCode] : []);
+        $client->request('POST', '/auth/access', [], [], [], $expectedAuthCode? json_encode(['code' => $expectedAuthCode]) : null);
 
         $response = $client->getResponse();
         $responseData = json_decode($response->getContent(), true);
diff --git a/test/OAuth/GrantFlowTest.php b/test/OAuth/GrantFlowTest.php
index b4e21eb..175ba10 100644
--- a/test/OAuth/GrantFlowTest.php
+++ b/test/OAuth/GrantFlowTest.php
@@ -81,7 +81,7 @@ public function testFlow($expectToSucceed, $clientId, $redirectUri, $username, $
         } else {
             $client = $this->createClient([], $app);
         }
-        $client->request('POST', '/auth/access', ['code' => $code]);
+        $client->request('POST', '/auth/access', [], [], [], json_encode(['code' => $code]));
         $response = $client->getResponse();
 
         if($response->getStatusCode() !== Response::HTTP_OK) {
diff --git a/test/OAuth/RefreshFlowTest.php b/test/OAuth/RefreshFlowTest.php
index 9b769c8..3a436c3 100644
--- a/test/OAuth/RefreshFlowTest.php
+++ b/test/OAuth/RefreshFlowTest.php
@@ -36,7 +36,7 @@ public function setUp() {
         $this->clientSecret = 'cl13nt53crt';
         $code = explode('?code=', $redirectTargetUrl)[1];
         $client = $this->createClient(['HTTP_X_CLIENT_SECRET' => $this->clientSecret], $app);
-        $client->request('POST', '/auth/access', ['code' => $code]);
+        $client->request('POST', '/auth/access', [], [], [], json_encode(['code' => $code]));
         $response = $client->getResponse();
 
         $this->credentials = json_decode($response->getContent(), true);