@@ -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; |
@@ -28,6 +27,7 @@ discard block |
||
28 | 27 | use PHPUnit\Framework\TestCase; |
29 | 28 | use Prophecy\Argument; |
30 | 29 | use Psr\Http\Message\ServerRequestInterface; |
30 | +use Psr\Http\Server\RequestHandlerInterface; |
|
31 | 31 | use SimpleBus\Message\Bus\MessageBus; |
32 | 32 | |
33 | 33 | /** |
@@ -22,7 +22,6 @@ |
||
22 | 22 | * @param ClientId $clientId |
23 | 23 | * @param DataBag $commandParameters |
24 | 24 | * @param DataBag $validatedParameters |
25 | - * @param UserAccountId|null $userAccountId |
|
26 | 25 | * @param callable $next |
27 | 26 | * |
28 | 27 | * @return DataBag |
@@ -17,6 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | /** |
19 | 19 | * @param AccessToken $token |
20 | + * @return void |
|
20 | 21 | */ |
21 | 22 | public function save(AccessToken $token); |
22 | 23 |
@@ -14,23 +14,23 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint; |
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | -use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
19 | -use Psr\Http\Server\MiddlewareInterface; |
|
20 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
18 | +use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
21 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
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\Exception\OAuth2Exception; |
|
26 | 24 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
25 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
27 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
28 | 27 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
29 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
30 | 28 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
31 | 29 | use OAuth2Framework\Component\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 | { |
@@ -16,10 +16,10 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\Bundle\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\Bundle\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
19 | 20 | use Symfony\Component\DependencyInjection\ChildDefinition; |
20 | 21 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 22 | use Symfony\Component\DependencyInjection\Reference; |
22 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
23 | 23 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
24 | 24 | |
25 | 25 | class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -35,7 +35,8 @@ |
||
35 | 35 | public function build(ContainerBuilder $container); |
36 | 36 | |
37 | 37 | /** |
38 | - * @param NodeDefinition $node |
|
38 | + * @param ArrayNodeDefinition $node |
|
39 | + * @return void |
|
39 | 40 | */ |
40 | 41 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 42 |
@@ -15,11 +15,11 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\Client\Event as ClientEvent; |
17 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
18 | +use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
18 | 19 | use OAuth2Framework\Component\Core\Event\Event; |
19 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
20 | 20 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
21 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
21 | 22 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
22 | -use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
23 | 23 | use SimpleBus\Message\Recorder\ContainsRecordedMessages; |
24 | 24 | use SimpleBus\Message\Recorder\PrivateMessageRecorderCapabilities; |
25 | 25 |
@@ -26,14 +26,14 @@ |
||
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\Exception\OAuth2Exception; |
|
32 | 32 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
33 | 33 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
34 | 34 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
35 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
36 | 35 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
36 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
37 | 37 | use OAuth2Framework\Component\TrustedIssuer\TrustedIssuerRepository; |
38 | 38 | use Psr\Http\Message\ServerRequestInterface; |
39 | 39 |
@@ -15,11 +15,11 @@ |
||
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | 17 | use function League\Uri\parse; |
18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
19 | -use Psr\Http\Server\MiddlewareInterface; |
|
20 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
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 IssuerDiscoveryEndpoint implements MiddlewareInterface |
25 | 25 | { |