Merge pull request #30 from fabiang/audience-support

Added support for `audience` parameter, thanks @fabiang!

Author: kamermans

src/GrantType/ClientCredentials.php

@@ -86,6 +86,10 @@ protected function getPostBody()
                 $data['scope'] = $this->config['scope'];
             }
 
+            if (!empty($this->config['audience'])) {
+                $data['audience'] = $this->config['audience'];
+            }
+
             return \GuzzleHttp\Psr7\stream_for(http_build_query($data, '', '&'));
         }
 
@@ -98,6 +102,10 @@ protected function getPostBody()
             $postBody->setField('scope', $this->config['scope']);
         }
 
+        if (!empty($this->config['audience'])) {
+            $postBody->setField('audience', $this->config['audience']);
+        }
+
         return $postBody;
     }
 }

tests/GrantType/ClientCredentialsTest.php

@@ -42,6 +42,79 @@ public function testGetRawData()
         }
     }
 
+    public function testAudienceParameterIsPassedGuzzle6()
+    {
+        if (Helper::guzzleIs('<', 6)) {
+            $this->markTestSkipped('This test is for Guzzle >= 6');
+            return;
+        }
+
+        $response_data = [];
+
+        $responder = new MockHandler([
+            new Psr7Response(200, [], json_encode($response_data)),
+        ]);
+
+        $container = [];
+        $history = Middleware::history($container);
+
+        $handler = HandlerStack::create($responder);
+        $handler->push($history);
+
+        $client = new Client([
+            'handler'  => $handler,
+            'base_uri' => 'http://localhost:10000/oauth_token',
+        ]);
+
+        $grant = new ClientCredentials($client, [
+            'client_id'     => 'foo',
+            'client_secret' => 'bar',
+            'audience'      => 'http://localhost:20000',
+        ]);
+
+        $signer = new \kamermans\OAuth2\Signer\ClientCredentials\BasicAuth();
+
+        $data = $grant->getRawData($signer);
+
+        $this->assertNotEmpty($container);
+        $request_body = $container[0]['request']->getBody();
+
+        parse_str($request_body, $form_data);
+
+        $this->assertSame('http://localhost:20000', $form_data['audience']);
+    }
+
+    public function testAudienceParameterIsPassedGuzzleLegacy()
+    {
+        if (Helper::guzzleIs('>=', 6)) {
+            $this->markTestSkipped('This test is for Guzzle < 6');
+            return;
+        }
+
+        $response_data = [];
+        $response      = new Response(200, [], Stream::factory(json_encode($response_data)));
+
+        $responder = new MockResponder([$response]);
+        $history   = new History();
+
+        $client = new Client();
+        $client->getEmitter()->attach($responder);
+        $client->getEmitter()->attach($history);
+
+        $grant = new ClientCredentials($client, [
+            'client_id'     => 'foo',
+            'client_secret' => 'bar',
+            'audience'      => 'http://localhost:20000',
+        ]);
+
+        $signer = new \kamermans\OAuth2\Signer\ClientCredentials\BasicAuth();
+
+        $data         = $grant->getRawData($signer);
+        $request_body = $history->getLastRequest()->getBody();
+
+        $this->assertSame('http://localhost:20000', $request_body->getField('audience'));
+    }
+
     protected function doGetRawData6Plus()
     {
         $response_data = [
@@ -65,9 +138,10 @@ protected function doGetRawData6Plus()
         ]);
 
         $grant = new ClientCredentials($client, [
-            'client_id' => 'foo',
+            'client_id'     => 'foo',
             'client_secret' => 'bar',
-            'scope' => 'foo,bar',
+            'scope'         => 'foo,bar',
+            'audience'      => '', // empty: should not be added to request
         ]);
 
         $signer = new \kamermans\OAuth2\Signer\ClientCredentials\BasicAuth();
@@ -82,6 +156,7 @@ protected function doGetRawData6Plus()
         $this->assertEquals($response_data, $data);
         $this->assertEquals('foo,bar', $form_data['scope']);
         $this->assertEquals('client_credentials', $form_data['grant_type']);
+        $this->assertArrayNotHasKey('audience', $form_data);
     }
 
     protected function doGetRawDataLegacy()
@@ -100,9 +175,10 @@ protected function doGetRawDataLegacy()
         $client->getEmitter()->attach($history);
 
         $grant = new ClientCredentials($client, [
-            'client_id' => 'foo',
+            'client_id'     => 'foo',
             'client_secret' => 'bar',
-            'scope' => 'foo,bar',
+            'scope'         => 'foo,bar',
+            'audience'      => '', // empty: should not be added to request
         ]);
 
         $signer = new \kamermans\OAuth2\Signer\ClientCredentials\BasicAuth();
@@ -113,5 +189,6 @@ protected function doGetRawDataLegacy()
         $this->assertEquals($response_data, $data);
         $this->assertEquals('foo,bar', $request_body->getField('scope'));
         $this->assertEquals('client_credentials', $request_body->getField('grant_type'));
+        $this->assertNull($request_body->getField('audience'));
     }
 }