@@ -18,9 +18,9 @@ |
||
18 | 18 | use OAuth2Framework\SecurityBundle\DependencyInjection\Compiler\TokenTypeCompilerPass; |
19 | 19 | use OAuth2Framework\SecurityBundle\DependencyInjection\OAuth2FrameworkSecurityExtension; |
20 | 20 | use OAuth2Framework\SecurityBundle\Security\Factory\OAuth2SecurityFactory; |
21 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension; |
|
21 | 22 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
22 | 23 | use Symfony\Component\HttpKernel\Bundle\Bundle; |
23 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension; |
|
24 | 24 | |
25 | 25 | final class OAuth2FrameworkSecurityBundle extends Bundle |
26 | 26 | { |
@@ -13,13 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\SecurityBundle\Security\Firewall; |
15 | 15 | |
16 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
17 | -use OAuth2Framework\Component\Core\Message\OAuth2MessageFactoryManager; |
|
18 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
19 | -use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
20 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
21 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
18 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
19 | +use OAuth2Framework\Component\Core\Message\OAuth2MessageFactoryManager; |
|
22 | 20 | use OAuth2Framework\Component\Core\TokenType\TokenTypeManager; |
21 | +use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
23 | 22 | use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory; |
24 | 23 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
25 | 24 | use Symfony\Component\HttpKernel\Event\GetResponseEvent; |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace OAuth2Framework\SecurityBundle\Tests\TestBundle\Controller; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
17 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
18 | 17 | use OAuth2Framework\SecurityBundle\Annotation\OAuth2; |
18 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
19 | 19 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
20 | 20 | use Symfony\Component\HttpFoundation\JsonResponse; |
21 | 21 | use Symfony\Component\HttpFoundation\Response; |
@@ -14,12 +14,12 @@ |
||
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; |
19 | +use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
|
20 | 20 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
21 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
21 | 22 | use Psr\Http\Message\ServerRequestInterface; |
22 | -use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
|
23 | 23 | |
24 | 24 | final class AuthorizationCodeGrantType implements GrantType |
25 | 25 | { |
@@ -15,13 +15,13 @@ |
||
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; |
19 | 20 | use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
21 | +use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
20 | 22 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtension; |
21 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
22 | 23 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
23 | -use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
24 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
24 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
25 | 25 | use Psr\Http\Message\ServerRequestInterface; |
26 | 26 | |
27 | 27 | final class TokenEndpointScopeExtension implements TokenEndpointExtension |
@@ -37,15 +37,15 @@ |
||
37 | 37 | use Jose\Component\Signature\JWSTokenSupport; |
38 | 38 | use Jose\Component\Signature\JWSVerifier; |
39 | 39 | use Jose\Component\Signature\Serializer\CompactSerializer; |
40 | +use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
41 | +use OAuth2Framework\Component\ClientAuthentication\ClientAssertionJwt; |
|
40 | 42 | use OAuth2Framework\Component\Core\Client\Client; |
41 | 43 | use OAuth2Framework\Component\Core\Client\ClientId; |
42 | 44 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
43 | 45 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
44 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
45 | -use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
46 | -use OAuth2Framework\Component\ClientAuthentication\ClientAssertionJwt; |
|
47 | 46 | use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuer; |
48 | 47 | use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
48 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
49 | 49 | use PHPUnit\Framework\TestCase; |
50 | 50 | use Prophecy\Prophecy\ObjectProphecy; |
51 | 51 | use Psr\Http\Message\ServerRequestInterface; |
@@ -15,9 +15,6 @@ discard block |
||
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
17 | 17 | use Http\Message\ResponseFactory; |
18 | -use Prophecy\Prophecy\ObjectProphecy; |
|
19 | -use Psr\Http\Message\StreamInterface; |
|
20 | -use Psr\Http\Server\RequestHandlerInterface; |
|
21 | 18 | use OAuth2Framework\Component\BearerTokenType\BearerToken; |
22 | 19 | use OAuth2Framework\Component\ClientConfigurationEndpoint\ClientConfigurationEndpoint; |
23 | 20 | use OAuth2Framework\Component\ClientRule\RuleManager; |
@@ -27,7 +24,10 @@ discard block |
||
27 | 24 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
28 | 25 | use PHPUnit\Framework\TestCase; |
29 | 26 | use Prophecy\Argument; |
27 | +use Prophecy\Prophecy\ObjectProphecy; |
|
30 | 28 | use Psr\Http\Message\ServerRequestInterface; |
29 | +use Psr\Http\Message\StreamInterface; |
|
30 | +use Psr\Http\Server\RequestHandlerInterface; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @group ClientConfigurationEndpoint |
@@ -15,9 +15,6 @@ discard block |
||
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
17 | 17 | use Http\Message\ResponseFactory; |
18 | -use Prophecy\Prophecy\ObjectProphecy; |
|
19 | -use Psr\Http\Message\StreamInterface; |
|
20 | -use Psr\Http\Server\RequestHandlerInterface; |
|
21 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
22 | 19 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
23 | 20 | use OAuth2Framework\Component\Core\Token\Token; |
@@ -25,7 +22,10 @@ discard block |
||
25 | 22 | use OAuth2Framework\Component\TokenIntrospectionEndpoint\TokenTypeHint; |
26 | 23 | use OAuth2Framework\Component\TokenIntrospectionEndpoint\TokenTypeHintManager; |
27 | 24 | use PHPUnit\Framework\TestCase; |
25 | +use Prophecy\Prophecy\ObjectProphecy; |
|
28 | 26 | use Psr\Http\Message\ServerRequestInterface; |
27 | +use Psr\Http\Message\StreamInterface; |
|
28 | +use Psr\Http\Server\RequestHandlerInterface; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @group TokenIntrospectionEndpoint |
@@ -15,9 +15,6 @@ discard block |
||
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
17 | 17 | use Http\Message\ResponseFactory; |
18 | -use Prophecy\Prophecy\ObjectProphecy; |
|
19 | -use Psr\Http\Message\StreamInterface; |
|
20 | -use Psr\Http\Server\RequestHandlerInterface; |
|
21 | 18 | use OAuth2Framework\Component\Core\Client\Client; |
22 | 19 | use OAuth2Framework\Component\Core\Client\ClientId; |
23 | 20 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
@@ -27,7 +24,10 @@ discard block |
||
27 | 24 | use OAuth2Framework\Component\TokenRevocationEndpoint\TokenTypeHint; |
28 | 25 | use OAuth2Framework\Component\TokenRevocationEndpoint\TokenTypeHintManager; |
29 | 26 | use PHPUnit\Framework\TestCase; |
27 | +use Prophecy\Prophecy\ObjectProphecy; |
|
30 | 28 | use Psr\Http\Message\ServerRequestInterface; |
29 | +use Psr\Http\Message\StreamInterface; |
|
30 | +use Psr\Http\Server\RequestHandlerInterface; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @group TokenRevocationEndpoint |