@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace OAuth2Framework\ServerBundle\Component\OpenIdConnect; |
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\ServerBundle\Component\Component; |
| 17 | -use OAuth2Framework\ServerBundle\Component\OpenIdConnect\Compiler\UserinfoRouteCompilerPass; |
|
| 18 | 17 | use OAuth2Framework\ServerBundle\Component\OpenIdConnect\Compiler\UserInfoScopeSupportCompilerPass; |
| 18 | +use OAuth2Framework\ServerBundle\Component\OpenIdConnect\Compiler\UserinfoRouteCompilerPass; |
|
| 19 | 19 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
| 20 | 20 | use Symfony\Component\Config\FileLocator; |
| 21 | 21 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace OAuth2Framework\Component\BearerTokenType; |
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 17 | -use OAuth2Framework\Component\Core\Token\Token; |
|
| 18 | 17 | use OAuth2Framework\Component\Core\TokenType\TokenType; |
| 18 | +use OAuth2Framework\Component\Core\Token\Token; |
|
| 19 | 19 | use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
| 20 | 20 | use Psr\Http\Message\ServerRequestInterface; |
| 21 | 21 | |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
| 20 | 20 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
| 21 | 21 | use OAuth2Framework\Component\Core\TokenType\TokenType; |
| 22 | -use OAuth2Framework\Component\Core\User\User; |
|
| 23 | 22 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
| 23 | +use OAuth2Framework\Component\Core\User\User; |
|
| 24 | 24 | |
| 25 | 25 | class AuthorizationRequest |
| 26 | 26 | { |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\AuthorizationEndpoint\User; |
| 15 | 15 | |
| 16 | -use OAuth2Framework\Component\Core\User\User; |
|
| 17 | 16 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
| 17 | +use OAuth2Framework\Component\Core\User\User; |
|
| 18 | 18 | |
| 19 | 19 | interface UserDiscovery |
| 20 | 20 | { |
@@ -19,9 +19,9 @@ |
||
| 19 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 20 | 20 | use OAuth2Framework\Component\Core\Client\Client; |
| 21 | 21 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
| 22 | +use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
| 22 | 23 | use OAuth2Framework\Component\Core\User\User; |
| 23 | 24 | use OAuth2Framework\Component\Core\User\UserRepository; |
| 24 | -use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
| 25 | 25 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtension; |
| 26 | 26 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
| 27 | 27 | use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace OAuth2Framework\Component\OpenIdConnect\UserInfo; |
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\Client\Client; |
| 17 | -use OAuth2Framework\Component\Core\User\User; |
|
| 18 | 17 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
| 18 | +use OAuth2Framework\Component\Core\User\User; |
|
| 19 | 19 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\Claim\ClaimManager; |
| 20 | 20 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\Claim\ClaimSourceManager; |
| 21 | 21 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\Pairwise\PairwiseSubjectIdentifierAlgorithm; |
@@ -21,11 +21,11 @@ |
||
| 21 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
| 22 | 22 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
| 23 | 23 | use OAuth2Framework\Component\Core\Message\OAuth2Error; |
| 24 | -use OAuth2Framework\Component\Core\User\User; |
|
| 25 | -use OAuth2Framework\Component\Core\User\UserRepository; |
|
| 26 | 24 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
| 27 | 25 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 28 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
| 27 | +use OAuth2Framework\Component\Core\User\User; |
|
| 28 | +use OAuth2Framework\Component\Core\User\UserRepository; |
|
| 29 | 29 | use OAuth2Framework\Component\OpenIdConnect\IdTokenBuilderFactory; |
| 30 | 30 | use Psr\Http\Message\ResponseInterface; |
| 31 | 31 | use Psr\Http\Message\ServerRequestInterface; |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Entity; |
| 15 | 15 | |
| 16 | -use OAuth2Framework\Component\Core\User\User as OAuth2UserInterface; |
|
| 17 | 16 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 17 | +use OAuth2Framework\Component\Core\User\User as OAuth2UserInterface; |
|
| 18 | 18 | use Symfony\Component\Security\Core\User\EquatableInterface; |
| 19 | 19 | use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface; |
| 20 | 20 | |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Entity; |
| 15 | 15 | |
| 16 | -use OAuth2Framework\Component\Core\User\UserRepository as UserRepositoryInterface; |
|
| 17 | 16 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 17 | +use OAuth2Framework\Component\Core\User\UserRepository as UserRepositoryInterface; |
|
| 18 | 18 | |
| 19 | 19 | class UserRepository implements UserRepositoryInterface |
| 20 | 20 | { |