@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
20 | 18 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
21 | 19 | use OAuth2Framework\Component\Core\TokenType\TokenTypeManager; |
22 | 20 | use Psr\Http\Message\ResponseInterface; |
23 | 21 | use Psr\Http\Message\ServerRequestInterface; |
22 | +use Psr\Http\Server\MiddlewareInterface; |
|
23 | +use Psr\Http\Server\RequestHandlerInterface; |
|
24 | 24 | |
25 | 25 | class AccessTokenMiddleware implements MiddlewareInterface |
26 | 26 | { |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
19 | 17 | use OAuth2Framework\Component\Core\Message\OAuth2MessageFactoryManager; |
20 | 18 | use Psr\Http\Message\ResponseInterface; |
21 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | +use Psr\Http\Server\MiddlewareInterface; |
|
21 | +use Psr\Http\Server\RequestHandlerInterface; |
|
22 | 22 | |
23 | 23 | final class OAuth2MessageMiddleware implements MiddlewareInterface |
24 | 24 | { |
@@ -14,10 +14,10 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\AuthorizationCodeGrant; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\PKCEMethodManager; |
17 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
18 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
19 | 18 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
20 | 19 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
20 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
21 | 21 | use Psr\Http\Message\ServerRequestInterface; |
22 | 22 | |
23 | 23 | final class AuthorizationCodeGrantType implements GrantType |
@@ -13,13 +13,13 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientAuthentication; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\Client\Client; |
19 | 17 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
20 | 18 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
21 | 19 | use Psr\Http\Message\ResponseInterface; |
22 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | +use Psr\Http\Server\MiddlewareInterface; |
|
22 | +use Psr\Http\Server\RequestHandlerInterface; |
|
23 | 23 | |
24 | 24 | class ClientAuthenticationMiddleware implements MiddlewareInterface |
25 | 25 | { |
@@ -26,15 +26,15 @@ |
||
26 | 26 | use Jose\Component\Signature\JWSVerifier; |
27 | 27 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
28 | 28 | use OAuth2Framework\Component\Core\Client\Client; |
29 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
30 | 29 | use OAuth2Framework\Component\Core\Client\ClientId; |
31 | 30 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
31 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
32 | 32 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
33 | +use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
33 | 34 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
34 | 35 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
35 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
36 | 36 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
37 | -use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
37 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
38 | 38 | use Psr\Http\Message\ServerRequestInterface; |
39 | 39 | |
40 | 40 | class JwtBearerGrantType implements GrantType |
@@ -13,13 +13,13 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ResourceServerAuthentication; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
16 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
18 | 17 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
19 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerRepository; |
20 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
21 | 19 | use Psr\Http\Message\ResponseInterface; |
22 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | +use Psr\Http\Server\MiddlewareInterface; |
|
22 | +use Psr\Http\Server\RequestHandlerInterface; |
|
23 | 23 | |
24 | 24 | final class AuthenticationMiddleware implements MiddlewareInterface |
25 | 25 | { |
@@ -15,12 +15,12 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
17 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
18 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
18 | 19 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
20 | +use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
19 | 21 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtension; |
20 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
21 | 22 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
22 | -use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
23 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
23 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
24 | 24 | use Psr\Http\Message\ServerRequestInterface; |
25 | 25 | |
26 | 26 | final class TokenEndpointScopeExtension implements TokenEndpointExtension |
@@ -26,16 +26,19 @@ |
||
26 | 26 | /** |
27 | 27 | * @param array $configs |
28 | 28 | * @param ContainerBuilder $container |
29 | + * @return void |
|
29 | 30 | */ |
30 | 31 | public function load(array $configs, ContainerBuilder $container); |
31 | 32 | |
32 | 33 | /** |
33 | 34 | * @param ContainerBuilder $container |
35 | + * @return void |
|
34 | 36 | */ |
35 | 37 | public function build(ContainerBuilder $container); |
36 | 38 | |
37 | 39 | /** |
38 | - * @param NodeDefinition $node |
|
40 | + * @param ArrayNodeDefinition $node |
|
41 | + * @return void |
|
39 | 42 | */ |
40 | 43 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 44 |
@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use Jose\Bundle\JoseFramework\Helper\ConfigurationHelper; |
17 | 17 | use OAuth2Framework\ServerBundle\Component\Component; |
18 | -use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\TrustedIssuerSupportCompilerPass; |
|
19 | 18 | use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\EncryptedAssertionCompilerPass; |
19 | +use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\TrustedIssuerSupportCompilerPass; |
|
20 | 20 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
21 | 21 | use Symfony\Component\Config\FileLocator; |
22 | 22 | use Symfony\Component\DependencyInjection\ContainerBuilder; |