@@ -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,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,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 | { |
@@ -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 | } |
@@ -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 |