@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
19 | 17 | use OAuth2Framework\Component\Core\Response\OAuth2ResponseFactoryManager; |
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 OAuth2ResponseMiddleware implements MiddlewareInterface |
24 | 24 | { |
@@ -13,8 +13,6 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
20 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
@@ -23,6 +21,8 @@ discard block |
||
23 | 21 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
24 | 22 | use Psr\Http\Message\ResponseInterface; |
25 | 23 | use Psr\Http\Message\ServerRequestInterface; |
24 | +use Psr\Http\Server\MiddlewareInterface; |
|
25 | +use Psr\Http\Server\RequestHandlerInterface; |
|
26 | 26 | |
27 | 27 | final class OAuth2SecurityMiddleware implements MiddlewareInterface |
28 | 28 | { |
@@ -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\AuthorizationCodeGrant\AuthorizationCodeId; |
25 | 25 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
26 | 26 | use OAuth2Framework\Component\Core\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 |
@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * @param IdTokenId $idTokenId |
60 | 60 | * |
61 | - * @return IdToken|null |
|
61 | + * @return \self|null |
|
62 | 62 | */ |
63 | 63 | public function load(IdTokenId $idTokenId): ? IdToken |
64 | 64 | { |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\OpenIdConnect\UserInfo; |
15 | 15 | |
16 | +use OAuth2Framework\Component\Core\Client\Client; |
|
17 | +use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
16 | 18 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\ClaimSource\ClaimSourceManager; |
17 | 19 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\Pairwise\PairwiseSubjectIdentifierAlgorithm; |
18 | 20 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\ScopeSupport\UserInfoScopeSupportManager; |
19 | -use OAuth2Framework\Component\Core\Client\Client; |
|
20 | -use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
21 | 21 | |
22 | 22 | final class UserInfo |
23 | 23 | { |
@@ -14,21 +14,21 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\OpenIdConnect\UserInfoEndpoint; |
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | -use Psr\Http\Server\RequestHandlerInterface; |
|
18 | -use Psr\Http\Server\MiddlewareInterface; |
|
19 | 17 | use Jose\Component\Core\JWKSet; |
20 | 18 | use Jose\Component\Encryption\JWEBuilder; |
21 | 19 | use Jose\Component\Signature\JWSBuilder; |
22 | 20 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
23 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
24 | 22 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
23 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
26 | 24 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
25 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
27 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
28 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
29 | 27 | use OAuth2Framework\Component\OpenIdConnect\IdTokenBuilderFactory; |
30 | 28 | use Psr\Http\Message\ResponseInterface; |
31 | 29 | use Psr\Http\Message\ServerRequestInterface; |
30 | +use Psr\Http\Server\MiddlewareInterface; |
|
31 | +use Psr\Http\Server\RequestHandlerInterface; |
|
32 | 32 | |
33 | 33 | final class UserInfoEndpoint implements MiddlewareInterface |
34 | 34 | { |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\RefreshTokenGrant\Command; |
15 | 15 | |
16 | -use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
17 | 16 | use OAuth2Framework\Component\Core\Client\ClientId; |
18 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
19 | -use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
20 | 18 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
19 | +use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
20 | +use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
21 | 21 | |
22 | 22 | final class CreateRefreshTokenCommand |
23 | 23 | { |
@@ -15,13 +15,13 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\Client\ClientId; |
17 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
18 | +use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
18 | 19 | use OAuth2Framework\Component\Core\Event\Event; |
19 | 20 | use OAuth2Framework\Component\Core\Event\EventId; |
20 | 21 | use OAuth2Framework\Component\Core\Id\Id; |
21 | -use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
22 | 22 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
23 | 23 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
24 | -use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
24 | +use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
25 | 25 | |
26 | 26 | final class RefreshTokenCreatedEvent extends Event |
27 | 27 | { |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\RefreshTokenGrant; |
15 | 15 | |
16 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
17 | 16 | use OAuth2Framework\Component\Core\Client\Client; |
18 | 17 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
19 | 18 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
19 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
20 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | 21 | |
22 | 22 | final class RefreshTokenGrantType implements GrantType |