@@ -14,25 +14,25 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint\Tests; |
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\GuzzleMessageFactory; |
17 | +use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
17 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
18 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
19 | 20 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
20 | -use Psr\Http\Server\RequestHandlerInterface; |
|
21 | -use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
22 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
23 | 22 | use OAuth2Framework\Component\Core\Client\ClientId; |
24 | 23 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | 24 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
26 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
27 | 25 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
26 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
27 | +use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
28 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
29 | 29 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
30 | 30 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
31 | 31 | use OAuth2Framework\Component\TokenEndpoint\TokenEndpoint; |
32 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
33 | 32 | use PHPUnit\Framework\TestCase; |
34 | 33 | use Prophecy\Argument; |
35 | 34 | use Psr\Http\Message\ServerRequestInterface; |
35 | +use Psr\Http\Server\RequestHandlerInterface; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @group TokenEndpoint |
@@ -14,23 +14,23 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint; |
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | +use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
17 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
18 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
19 | -use Psr\Http\Server\RequestHandlerInterface; |
|
20 | -use Psr\Http\Server\MiddlewareInterface; |
|
21 | -use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
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\Message\OAuth2Message; |
|
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\Message\OAuth2Message; |
|
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 | { |
@@ -23,6 +23,7 @@ |
||
23 | 23 | * @param OAuth2 $configuration |
24 | 24 | * |
25 | 25 | * @throws \Exception |
26 | + * @return void |
|
26 | 27 | */ |
27 | 28 | public function check(OAuth2Token $token, OAuth2 $configuration): void; |
28 | 29 | } |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Form\Handler; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
17 | 16 | use OAuth2Framework\Component\AuthorizationEndpoint\Authorization; |
18 | 17 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
18 | +use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
19 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | 20 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
21 | 21 | use Symfony\Component\Form\ClickableInterface; |
@@ -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 |