@@ -15,5 +15,8 @@ |
||
15 | 15 | |
16 | 16 | interface UserAccountRepository |
17 | 17 | { |
18 | + /** |
|
19 | + * @return \OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\UserAccount|null |
|
20 | + */ |
|
18 | 21 | public function find(UserAccountId $publicId): ?UserAccount; |
19 | 22 | } |
@@ -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; |
@@ -53,6 +53,9 @@ |
||
53 | 53 | $this->claimSourceManager = $claimSourceManager; |
54 | 54 | } |
55 | 55 | |
56 | + /** |
|
57 | + * @param string $claimsLocales |
|
58 | + */ |
|
56 | 59 | public function getUserinfo(Client $client, User $user, UserAccount $userAccount, string $redirectUri, array $requestedClaims, ?string $scope, ?string $claimsLocales): array |
57 | 60 | { |
58 | 61 | $requestedClaims = \array_merge( |
@@ -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; |
@@ -17,5 +17,8 @@ |
||
17 | 17 | |
18 | 18 | interface ResourceOwnerPasswordCredentialManager |
19 | 19 | { |
20 | + /** |
|
21 | + * @return null|ResourceOwnerId |
|
22 | + */ |
|
20 | 23 | public function findResourceOwnerIdWithUsernameAndPassword(string $username, string $password): ?ResourceOwnerId; |
21 | 24 | } |
@@ -20,10 +20,19 @@ |
||
20 | 20 | { |
21 | 21 | public function name(): string; |
22 | 22 | |
23 | + /** |
|
24 | + * @return void |
|
25 | + */ |
|
23 | 26 | public function load(array $configs, ContainerBuilder $container); |
24 | 27 | |
28 | + /** |
|
29 | + * @return void |
|
30 | + */ |
|
25 | 31 | public function build(ContainerBuilder $container); |
26 | 32 | |
33 | + /** |
|
34 | + * @return void |
|
35 | + */ |
|
27 | 36 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
28 | 37 | |
29 | 38 | public function prepend(ContainerBuilder $container, array $config): array; |
@@ -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 | { |