@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Service; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
|
17 | 16 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
17 | +use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
|
18 | 18 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
19 | 19 | use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; |
20 | 20 | use Symfony\Component\Security\Core\User\UserInterface; |
@@ -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 | { |
@@ -303,7 +303,7 @@ |
||
303 | 303 | /** |
304 | 304 | * @param string $subject |
305 | 305 | * |
306 | - * @return ResourceOwnerId|null |
|
306 | + * @return ResourceOwnerId |
|
307 | 307 | */ |
308 | 308 | private function findResourceOwner(string $subject): ? ResourceOwnerId |
309 | 309 | { |
@@ -26,16 +26,16 @@ |
||
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\Core\Util\RequestBodyParser; |
|
30 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
31 | 29 | use OAuth2Framework\Component\Core\Client\ClientId; |
32 | 30 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
31 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
33 | 32 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
33 | +use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
34 | 34 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
35 | 35 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
36 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
36 | +use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
|
37 | 37 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
38 | -use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
38 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
39 | 39 | use Psr\Http\Message\ServerRequestInterface; |
40 | 40 | |
41 | 41 | class JwtBearerGrantType implements GrantType |
@@ -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 | } |
@@ -16,8 +16,8 @@ |
||
16 | 16 | use Jose\Bundle\JoseFramework\Helper\ConfigurationHelper; |
17 | 17 | use OAuth2Framework\Component\JwtBearerGrant\JwtBearerGrantType; |
18 | 18 | use OAuth2Framework\ServerBundle\Component\Component; |
19 | -use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\TrustedIssuerSupportCompilerPass; |
|
20 | 19 | use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\EncryptedAssertionCompilerPass; |
20 | +use OAuth2Framework\ServerBundle\Component\Grant\JwtBearer\Compiler\TrustedIssuerSupportCompilerPass; |
|
21 | 21 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
22 | 22 | use Symfony\Component\Config\FileLocator; |
23 | 23 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -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,10 +14,10 @@ |
||
14 | 14 | namespace OAuth2Framework\SecurityBundle\Annotation; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | -use OAuth2Framework\SecurityBundle\Annotation\Checker\Checker; |
|
18 | -use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
19 | 17 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
20 | 18 | use OAuth2Framework\Component\Core\Message\OAuth2MessageFactoryManager; |
19 | +use OAuth2Framework\SecurityBundle\Annotation\Checker\Checker; |
|
20 | +use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
21 | 21 | use Psr\Http\Message\ResponseInterface; |
22 | 22 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
23 | 23 | use Symfony\Component\HttpKernel\Event\FilterControllerEvent; |