@@ -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 | { |
@@ -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; |
@@ -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 |
@@ -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 |
@@ -15,7 +15,6 @@ discard block |
||
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
17 | 17 | use Http\Message\ResponseFactory; |
18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
19 | 18 | use OAuth2Framework\Component\BearerTokenType\BearerToken; |
20 | 19 | use OAuth2Framework\Component\ClientConfigurationEndpoint\ClientConfigurationEndpoint; |
21 | 20 | use OAuth2Framework\Component\ClientRule\RuleManager; |
@@ -26,6 +25,7 @@ discard block |
||
26 | 25 | use PHPUnit\Framework\TestCase; |
27 | 26 | use Prophecy\Argument; |
28 | 27 | use Psr\Http\Message\ServerRequestInterface; |
28 | +use Psr\Http\Server\RequestHandlerInterface; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @group ClientConfigurationEndpoint |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\Core\Client; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
17 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
18 | 17 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
18 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
19 | 19 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
20 | 20 | |
21 | 21 | /** |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientCredentialsGrant\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\ClientCredentialsGrant\ClientCredentialsGrantType; |
|
16 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
17 | 18 | use OAuth2Framework\Component\Core\Client\ClientId; |
18 | 19 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
19 | 20 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
20 | -use OAuth2Framework\Component\ClientCredentialsGrant\ClientCredentialsGrantType; |
|
21 | 21 | use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
22 | 22 | use PHPUnit\Framework\TestCase; |
23 | 23 | use Psr\Http\Message\ServerRequestInterface; |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Core\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 | final class AccessTokenMiddleware implements MiddlewareInterface |
26 | 26 | { |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Core\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 | { |