@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace OAuth2Framework\Bundle\DependencyInjection\Component\ClientAuthentication; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Bundle\DependencyInjection\Component\Component; |
17 | -use OAuth2Framework\Component\TokenEndpoint\AuthenticationMethod\AuthenticationMethod; |
|
18 | 17 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
19 | 18 | use Symfony\Component\Config\FileLocator; |
20 | 19 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace OAuth2Framework\Bundle\DependencyInjection\Component\ClientAuthentication; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Bundle\DependencyInjection\Component\Component; |
17 | -use OAuth2Framework\Component\TokenEndpoint\AuthenticationMethod\AuthenticationMethod; |
|
18 | 17 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
19 | 18 | use Symfony\Component\Config\FileLocator; |
20 | 19 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -16,9 +16,9 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\DependencyInjection\Component\Component; |
17 | 17 | use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\ClientConfiguration\ClientConfigurationSource; |
18 | 18 | use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\ClientRegistration\ClientRegistrationSource; |
19 | -use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\Token\TokenEndpointSource; |
|
20 | 19 | use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\TokenIntrospection\TokenIntrospectionEndpointSource; |
21 | 20 | use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\TokenRevocation\TokenRevocationEndpointSource; |
21 | +use OAuth2Framework\Bundle\DependencyInjection\Component\Endpoint\Token\TokenEndpointSource; |
|
22 | 22 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
23 | 23 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
24 | 24 |
@@ -17,8 +17,6 @@ |
||
17 | 17 | use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\AuthorizationCode\AuthorizationCodeSource; |
18 | 18 | use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\ClientCredentials\ClientCredentialsSource; |
19 | 19 | use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\Implicit\ImplicitSource; |
20 | -use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\JwtBearer\JwtBearerSource; |
|
21 | -use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\None\NoneSource; |
|
22 | 20 | use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\RefreshToken\RefreshTokenSource; |
23 | 21 | use OAuth2Framework\Bundle\DependencyInjection\Component\Grant\ResourceOwnerPasswordCredential\ResourceOwnerPasswordCredentialSource; |
24 | 22 | use OAuth2Framework\Component\AuthorizationEndpoint\ResponseType; |
@@ -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\Exception\OAuth2Exception; |
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 | { |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientAuthentication\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
17 | +use OAuth2Framework\Component\ClientAuthentication\ClientSecretBasic; |
|
16 | 18 | use OAuth2Framework\Component\Core\Client\Client; |
17 | 19 | use OAuth2Framework\Component\Core\Client\ClientId; |
18 | 20 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
19 | 21 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
20 | -use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
21 | -use OAuth2Framework\Component\ClientAuthentication\ClientSecretBasic; |
|
22 | 22 | use PHPUnit\Framework\TestCase; |
23 | 23 | use Psr\Http\Message\ServerRequestInterface; |
24 | 24 |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ResourceServerAuthentication; |
15 | 15 | |
16 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
16 | 17 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
17 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
18 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
19 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | 20 | |
21 | 21 | class AuthenticationMethodManager |
@@ -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\Exception\OAuth2Exception; |
|
18 | 17 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
19 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerRepository; |
20 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
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 AuthenticationMiddleware implements MiddlewareInterface |
25 | 25 | { |
@@ -13,12 +13,11 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ResourceServerAuthentication\Tests; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
16 | +use OAuth2Framework\Component\Core\DataBag\DataBag; |
|
17 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
17 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
18 | 19 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
19 | 20 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerRepository; |
20 | -use OAuth2Framework\Component\Core\DataBag\DataBag; |
|
21 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
22 | 21 | use OAuth2Framework\Component\ResourceServerAuthentication\AuthenticationMethod; |
23 | 22 | use OAuth2Framework\Component\ResourceServerAuthentication\AuthenticationMethodManager; |
24 | 23 | use OAuth2Framework\Component\ResourceServerAuthentication\AuthenticationMiddleware; |
@@ -26,6 +25,7 @@ discard block |
||
26 | 25 | use Prophecy\Argument; |
27 | 26 | use Psr\Http\Message\ResponseInterface; |
28 | 27 | use Psr\Http\Message\ServerRequestInterface; |
28 | +use Psr\Http\Server\RequestHandlerInterface; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @group TokenEndpoint |