fixes bshaffer#191 - passes config to HttpBasic

Author: bshaffer

src/OAuth2/Server.php

@@ -102,6 +102,7 @@ public function __construct($storage = array(), array $config = array(), array $
             'enforce_state'            => true,
             'require_exact_redirect_uri' => true,
             'allow_implicit'           => false,
+            'allow_credentials_in_request_body' => true,
         ), $config);
 
         foreach ($grantTypes as $key => $grantType) {
@@ -387,7 +388,8 @@ protected function createDefaultTokenController()
                     if (!isset($this->storages['client_credentials'])) {
                         throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
                     }
-                    $this->clientAssertionType = new HttpBasic($this->storages['client_credentials']);
+                    $config = array_intersect_key($this->config, array('allow_credentials_in_request_body' => ''));
+                    $this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
                     break;
                 }
             }

test/OAuth2/ServerTest.php

@@ -249,6 +249,22 @@ public function testCustomClientAssertionType()
         $server->handleTokenRequest($request, $response = new Response());
     }
 
+    public function testHttpBasicConfig()
+    {
+        // create mock storage
+        $storage = Bootstrap::getInstance()->getMemoryStorage();
+        $server = new Server(array($storage), array('allow_credentials_in_request_body' => false));
+        $server->getTokenController();
+        $httpBasic = $server->getClientAssertionType();
+
+        $reflection = new \ReflectionClass($httpBasic);
+        $prop = $reflection->getProperty('config');
+        $prop->setAccessible(true);
+
+        $config = $prop->getValue($httpBasic); // get the private "storages" property
+        $this->assertEquals($config['allow_credentials_in_request_body'], false);
+    }
+
     /**
      * @expectedException InvalidArgumentException OAuth2\ResponseType\AuthorizationCodeInterface
      **/