@@ -18,9 +18,9 @@ |
||
18 | 18 | use Jose\Component\Core\JWK; |
19 | 19 | use Jose\Component\Core\JWKSet; |
20 | 20 | use Jose\Component\Encryption\JWEBuilder; |
21 | +use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
21 | 22 | use Jose\Component\Signature\JWSBuilder; |
22 | 23 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
23 | -use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
24 | 24 | use OAuth2Framework\Component\Server\Endpoint\UserInfo\UserInfo; |
25 | 25 | use OAuth2Framework\Component\Server\Model\AccessToken\AccessToken; |
26 | 26 | use OAuth2Framework\Component\Server\Model\AccessToken\AccessTokenId; |
@@ -308,7 +308,7 @@ |
||
308 | 308 | |
309 | 309 | /** |
310 | 310 | * @param JWSBuilder $jwsBuilder |
311 | - * @param JWKSet $signatureKeys |
|
311 | + * @param JWKSet|null $signatureKeys |
|
312 | 312 | * @param string $signatureAlgorithm |
313 | 313 | * |
314 | 314 | * @return IdTokenBuilder |
@@ -16,8 +16,8 @@ |
||
16 | 16 | use Assert\Assertion; |
17 | 17 | use Http\Message\MessageFactory; |
18 | 18 | use Interop\Http\Factory\UriFactoryInterface; |
19 | -use Interop\Http\Server\RequestHandlerInterface; |
|
20 | 19 | use Interop\Http\Server\MiddlewareInterface; |
20 | +use Interop\Http\Server\RequestHandlerInterface; |
|
21 | 21 | use OAuth2Framework\Component\Server\Model\Resource\ResourceId; |
22 | 22 | use OAuth2Framework\Component\Server\Model\Resource\ResourceInterface; |
23 | 23 | use OAuth2Framework\Component\Server\Model\Resource\ResourceRepositoryInterface; |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\Server\Endpoint\UserInfo; |
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory; |
17 | -use Interop\Http\Server\RequestHandlerInterface; |
|
18 | 17 | use Interop\Http\Server\MiddlewareInterface; |
18 | +use Interop\Http\Server\RequestHandlerInterface; |
|
19 | 19 | use Jose\Component\Core\JWKSet; |
20 | 20 | use Jose\Component\Encryption\JWEBuilder; |
21 | 21 | use Jose\Component\Signature\JWSBuilder; |
@@ -16,11 +16,11 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Server\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\Bundle\Server\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\Bundle\Server\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
20 | +use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
|
19 | 21 | use Symfony\Component\DependencyInjection\ChildDefinition; |
20 | 22 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 23 | use Symfony\Component\DependencyInjection\Reference; |
22 | -use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
|
23 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
24 | 24 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
25 | 25 | |
26 | 26 | final class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\Server\Middleware; |
15 | 15 | |
16 | 16 | use Assert\Assertion; |
17 | -use Interop\Http\Server\RequestHandlerInterface; |
|
18 | 17 | use Interop\Http\Server\MiddlewareInterface; |
18 | +use Interop\Http\Server\RequestHandlerInterface; |
|
19 | 19 | use OAuth2Framework\Component\Server\Model\AccessToken\AccessToken; |
20 | 20 | use OAuth2Framework\Component\Server\Model\AccessToken\AccessTokenId; |
21 | 21 | use OAuth2Framework\Component\Server\Response\OAuth2Exception; |