Merge pull request #14 from gregurco/add_options

Add options (audience and retry_limit)
gregurco · Jul 2, 2018 · 615f6e9 · 615f6e9
2 parents 691a611 + 157ba2c
commit 615f6e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -155,8 +155,10 @@ eight_points_guzzle:
 | resource | The App ID URI of the web API (secured resource) | no | https://service.contoso.com/ |
 | private_key | Path to private key | for JwtBearer grant type | `"%kernel.root_dir%/path/to/private.key"` |
 | scope | One or more scope values indicating which parts of the user's account you wish to access | no | administration |
+| audience | | no | |
 | grant_type | Grant type class path. Class should implement GrantTypeInterface. <br/> Default: `Sainsburys\\Guzzle\\Oauth2\\GrantType\\ClientCredentials` | no | `Sainsburys\\Guzzle\\Oauth2\\GrantType\\PasswordCredentials`<br/>`Sainsburys\\Guzzle\\Oauth2\\GrantType\\AuthorizationCode`<br/>`Sainsburys\\Guzzle\\Oauth2\\GrantType\\JwtBearer` |
 | persistent | Token will be stored in session. <br/> Default: false | no | |
+| retry_limit | How many times request will be repeated on failure. <br/> Default: 5 | no | |
 
 See more information about middleware [here][3].
 

diff --git a/src/GuzzleBundleOAuth2Plugin.php b/src/GuzzleBundleOAuth2Plugin.php
@@ -50,6 +50,7 @@ public function loadForClient(array $config, ContainerBuilder $container, string
                 GrantTypeBase::CONFIG_RESOURCE => $config['resource'],
                 JwtBearer::CONFIG_PRIVATE_KEY => null,
                 'scope' => $config['scope'],
+                'audience' => $config['audience'],
             ];
 
             if ($config['private_key']) {
@@ -110,7 +111,11 @@ public function loadForClient(array $config, ContainerBuilder $container, string
             $container->setDefinition($oAuth2MiddlewareDefinitionName, $oAuth2MiddlewareDefinition);
 
             $onBeforeExpression = new Expression(sprintf('service("%s").onBefore()', $oAuth2MiddlewareDefinitionName));
-            $onFailureExpression = new Expression(sprintf('service("%s").onFailure(5)', $oAuth2MiddlewareDefinitionName));
+            $onFailureExpression = new Expression(sprintf(
+                'service("%s").onFailure(%d)',
+                $oAuth2MiddlewareDefinitionName,
+                $config['retry_limit']
+            ));
 
             $handler->addMethodCall('push', [$onBeforeExpression]);
             $handler->addMethodCall('push', [$onFailureExpression]);
@@ -160,6 +165,7 @@ public function addConfiguration(ArrayNodeDefinition $pluginNode)
                 ->scalarNode('client_secret')->defaultNull()->end()
                 ->scalarNode('token_url')->defaultNull()->end()
                 ->scalarNode('scope')->defaultNull()->end()
+                ->scalarNode('audience')->defaultNull()->end()
                 ->scalarNode('resource')->defaultNull()->end()
                 ->scalarNode('private_key')->defaultNull()->end()
                 ->scalarNode('auth_location')
@@ -179,6 +185,7 @@ public function addConfiguration(ArrayNodeDefinition $pluginNode)
                     ->end()
                 ->end()
                 ->booleanNode('persistent')->defaultFalse()->end()
+                ->booleanNode('retry_limit')->defaultValue(5)->end()
             ->end();
     }
 

diff --git a/tests/GuzzleBundleOAuth2PluginTest.php b/tests/GuzzleBundleOAuth2PluginTest.php
@@ -57,11 +57,13 @@ public function testAddConfiguration()
                 'client_secret' => null,
                 'token_url' => null,
                 'scope' => null,
+                'audience' => null,
                 'resource' => null,
                 'private_key' => null,
                 'auth_location' => 'headers',
                 'grant_type' => ClientCredentials::class,
                 'persistent' => false,
+                'retry_limit' => 5,
             ],
             $node->getDefaultValue()
         );
@@ -100,11 +102,13 @@ public function testLoadForClient()
                 'client_id' => 'test-client-id',
                 'client_secret' => '',
                 'scope' => 'administration',
+                'audience' => null,
                 'resource' => null,
                 'private_key' => null,
                 'auth_location' => 'headers',
                 'grant_type' => ClientCredentials::class,
                 'persistent' => false,
+                'retry_limit' => 5,
             ],
             $container, 'api_payment', $handler
         );
@@ -131,11 +135,13 @@ public function testLoadForClientWithPrivateKey()
                 'client_id' => 'test-client-id',
                 'client_secret' => '',
                 'scope' => 'administration',
+                'audience' => null,
                 'resource' => null,
                 'private_key' => '/path/to/private.key',
                 'auth_location' => 'headers',
                 'grant_type' => JwtBearer::class,
                 'persistent' => false,
+                'retry_limit' => 5,
             ],
             $container, 'api_payment', $handler
         );