@@ -16,8 +16,8 @@ |
||
16 | 16 | use OAuth2Framework\Component\AuthorizationEndpoint\ResponseMode\ResponseMode; |
17 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
18 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
19 | -use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
20 | 19 | use OAuth2Framework\Component\Core\TokenType\TokenType; |
20 | +use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
21 | 21 | |
22 | 22 | class Authorization |
23 | 23 | { |
@@ -21,10 +21,10 @@ |
||
21 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
22 | 22 | use OAuth2Framework\Component\Core\Client\ClientId; |
23 | 23 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
24 | +use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
24 | 25 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
25 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
26 | 27 | use OAuth2Framework\Component\ImplicitGrant\TokenResponseType; |
27 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
28 | 28 | use PHPUnit\Framework\TestCase; |
29 | 29 | use Prophecy\Argument; |
30 | 30 |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\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\Exception\OAuth2Exception; |
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,8 +13,6 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
20 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
@@ -23,6 +21,8 @@ discard block |
||
23 | 21 | use OAuth2Framework\Component\Core\TokenType\TokenTypeManager; |
24 | 22 | use Psr\Http\Message\ResponseInterface; |
25 | 23 | use Psr\Http\Message\ServerRequestInterface; |
24 | +use Psr\Http\Server\MiddlewareInterface; |
|
25 | +use Psr\Http\Server\RequestHandlerInterface; |
|
26 | 26 | |
27 | 27 | class OAuth2SecurityMiddleware implements MiddlewareInterface |
28 | 28 | { |
@@ -14,23 +14,23 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint; |
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | -use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
19 | -use Psr\Http\Server\MiddlewareInterface; |
|
20 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
18 | +use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
21 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
22 | 20 | use OAuth2Framework\Component\Core\Client\Client; |
23 | 21 | use OAuth2Framework\Component\Core\Client\ClientId; |
24 | 22 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
23 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
26 | 24 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
25 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
26 | +use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
27 | 27 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
28 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
29 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
30 | 29 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
31 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
32 | 30 | use Psr\Http\Message\ResponseInterface; |
33 | 31 | use Psr\Http\Message\ServerRequestInterface; |
32 | +use Psr\Http\Server\MiddlewareInterface; |
|
33 | +use Psr\Http\Server\RequestHandlerInterface; |
|
34 | 34 | |
35 | 35 | class TokenEndpoint implements MiddlewareInterface |
36 | 36 | { |
@@ -14,12 +14,12 @@ |
||
14 | 14 | namespace OAuth2Framework\ServerBundle\Annotation; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | -use OAuth2Framework\ServerBundle\Annotation\Checker\Checker; |
|
18 | -use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
19 | 17 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
20 | 18 | use OAuth2Framework\Component\Core\Response\OAuth2Response; |
21 | 19 | use OAuth2Framework\Component\Core\Response\OAuth2ResponseFactoryManager; |
22 | 20 | use OAuth2Framework\Component\Core\TokenType\TokenTypeManager; |
21 | +use OAuth2Framework\ServerBundle\Annotation\Checker\Checker; |
|
22 | +use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
23 | 23 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
24 | 24 | use Symfony\Component\HttpKernel\Event\FilterControllerEvent; |
25 | 25 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |