From be3ae61dbf8f75d949556cf6c00992d7b22dc9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Tue, 19 Jul 2022 14:05:36 +0300 Subject: [PATCH 01/13] Update composer dependecies --- composer.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index af51ca2..df97eb1 100644 --- a/composer.json +++ b/composer.json @@ -11,17 +11,17 @@ ], "minimum-stability": "stable", "require": { - "php": ">=7.3", - "symfony/framework-bundle": "^4.0|^5.0", - "symfony/serializer": "^5.2", - "symfony/http-kernel": "^4.0|^5.0", - "symfony/validator": "^4.0|^5.3", - "symfony/security-guard": "^4.0|^5.0", - "symfony/console": "^5.2", - "symfony/messenger": "^5.2", - "symfony/process": "^5.2", - "symfony/event-dispatcher": "^5.2", - "symfony/lock": "^5.2" + "php": ">=8.0.2", + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/serializer": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/validator": "^5.4|^6.0", + "symfony/security-bundle": "^6.0", + "symfony/console": "^5.4|^6.0", + "symfony/messenger": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0" }, "autoload": { "psr-4": { @@ -38,9 +38,9 @@ }, "require-dev": { "ext-json": "*", - "phpunit/phpunit": "^8.0 || ^9.0", - "doctrine/annotations": "^1.11", - "doctrine/cache": "^1.10", + "phpunit/phpunit": "^8.5|^9.5", + "doctrine/annotations": "^1.13.1", + "doctrine/cache": "^1.11|^2.0", "jms/serializer-bundle": "^3.8" }, "scripts": { From 3164804ac399767b7cd4f6b4b4ac4dbab53c7b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Tue, 19 Jul 2022 16:27:00 +0300 Subject: [PATCH 02/13] Update aunthenticators --- Resources/doc/Security.md | 91 ++++++++++++------------ Security/AbstractClientAuthenticator.php | 46 ++---------- Security/CallbackClientAuthenticator.php | 21 ++++-- Security/FrontApiClientAuthenticator.php | 32 +++++---- 4 files changed, 86 insertions(+), 104 deletions(-) diff --git a/Resources/doc/Security.md b/Resources/doc/Security.md index 9de58c1..d42c32f 100644 --- a/Resources/doc/Security.md +++ b/Resources/doc/Security.md @@ -4,67 +4,70 @@ Example security configuration: ```yaml security: + hide_user_not_found: false providers: - client: - entity: - class: 'App\Entity\Connection' # must implements UserInterface - property: 'clientId' + connection: + entity: { class: App\Entity\Connection, property: clientId } firewalls: - api: - pattern: ^/api - provider: client - anonymous: ~ - lazy: true - stateless: false - guard: - authenticators: - - RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + simple-connection: + pattern: ^/simple-connection + stateless: true + security: false callback: pattern: ^/callback - provider: client - anonymous: ~ - lazy: true + provider: connection stateless: true - guard: - authenticators: - - RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator + custom_authenticators: + - RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator + front: + pattern: ^/(front|login) + provider: connection + stateless: false + remember_me: + secret: '%kernel.secret%' + lifetime: 604800 # 1 week in seconds + always_remember_me: true + custom_authenticators: + - RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator main: - anonymous: true + pattern: ^/ lazy: true access_control: - - { path: ^/api/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } # login for programmatically authentication user - - { path: ^/api, roles: ROLE_USER } - - { path: ^/callback, roles: ROLE_USER } + - { path: ^/front, roles: IS_AUTHENTICATED_REMEMBERED } + - { path: ^/simple-connection, roles: PUBLIC_ACCESS } ``` To authenticate the user after creating it, you can use the following code ```php -use Symfony\Component\Security\Guard\GuardAuthenticatorHandler; -use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; + use App\Entity\Connection; + use App\Services\ConnectionManager; + use Symfony\Component\HttpFoundation\Request; + use Symfony\Component\Security\Http\Authentication\UserAuthenticatorInterface; + use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; -class AppController extends AbstractController -{ - public function someAction( - Request $request, - GuardAuthenticatorHandler $guardAuthenticatorHandler, - FrontApiClientAuthenticator $frontApiClientAuthenticator, - ConnectionManager $manager - ): Response { - $user = $manager->getUser(); // getting user + class AppController extends AbstractController + { + public function someAction( + Request $request, + Connection $connection, + ConnectionManager $manager, + UserAuthenticatorInterface $userAuthenticator, + FrontApiClientAuthenticator $authenticator + ): Response { + $exist = $manager->search($connection); //get connection - $guardAuthenticatorHandler->authenticateUserAndHandleSuccess( - $user, - $request, - $frontApiClientAuthenticator, - 'api' - ); - // ... + $userAuthenticator->authenticateUser( + $connection, + $authenticator, + $request + ); + } } -} ``` diff --git a/Security/AbstractClientAuthenticator.php b/Security/AbstractClientAuthenticator.php index 227b19e..386ac03 100644 --- a/Security/AbstractClientAuthenticator.php +++ b/Security/AbstractClientAuthenticator.php @@ -8,26 +8,15 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; -use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\User\UserProviderInterface; -use Symfony\Component\Security\Guard\AbstractGuardAuthenticator; +use Symfony\Component\Security\Http\Authenticator\AbstractAuthenticator; +use Symfony\Component\Security\Http\Authenticator\Passport\Passport; -/** - * Class AbstractClientAuthenticator - * - * @package RetailCrm\ServiceBundle\Security - */ -abstract class AbstractClientAuthenticator extends AbstractGuardAuthenticator +abstract class AbstractClientAuthenticator extends AbstractAuthenticator { public const AUTH_FIELD = 'clientId'; private $errorResponseFactory; - /** - * AbstractClientAuthenticator constructor. - * - * @param ErrorJsonResponseFactory $errorResponseFactory - */ public function __construct(ErrorJsonResponseFactory $errorResponseFactory) { $this->errorResponseFactory = $errorResponseFactory; @@ -36,37 +25,12 @@ abstract class AbstractClientAuthenticator extends AbstractGuardAuthenticator /** * {@inheritdoc } */ - public function start(Request $request, AuthenticationException $authException = null): Response - { - $error = new Error(); - $error->message = 'Authentication required'; - - return $this->errorResponseFactory->create($error,Response::HTTP_UNAUTHORIZED); - } + abstract public function supports(Request $request): ?bool; /** * {@inheritdoc } */ - public function getCredentials(Request $request): string - { - return $request->get(static::AUTH_FIELD); - } - - /** - * {@inheritdoc } - */ - public function getUser($credentials, UserProviderInterface $userProvider): ?UserInterface - { - return $userProvider->loadUserByUsername($credentials); - } - - /** - * {@inheritdoc } - */ - public function checkCredentials($credentials, UserInterface $user): bool - { - return true; - } + abstract public function authenticate(Request $request): Passport; /** * {@inheritdoc } diff --git a/Security/CallbackClientAuthenticator.php b/Security/CallbackClientAuthenticator.php index 698e924..1fc51bb 100644 --- a/Security/CallbackClientAuthenticator.php +++ b/Security/CallbackClientAuthenticator.php @@ -3,12 +3,8 @@ namespace RetailCrm\ServiceBundle\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Security\Http\Authenticator\Passport\Passport; -/** - * Class CallbackClientAuthenticator - * - * @package RetailCrm\ServiceBundle\Security - */ class CallbackClientAuthenticator extends AbstractClientAuthenticator { /** @@ -26,4 +22,19 @@ class CallbackClientAuthenticator extends AbstractClientAuthenticator { return false; } + + /** + * {@inheritdoc } + */ + public function authenticate(Request $request): Passport + { + $identifier = $request->request->get(static::AUTH_FIELD); + + return new SelfValidatingPassport( + new UserBadge($identifier, function ($userIdentifier) { + return $this->repository->findByIdentifier($userIdentifier); + }), + [] + ); + } } diff --git a/Security/FrontApiClientAuthenticator.php b/Security/FrontApiClientAuthenticator.php index af4fe26..c707f1a 100644 --- a/Security/FrontApiClientAuthenticator.php +++ b/Security/FrontApiClientAuthenticator.php @@ -2,32 +2,29 @@ namespace RetailCrm\ServiceBundle\Security; +use App\Repository\ConnectionRepository; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Security; +use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge; +use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; +use Symfony\Component\Security\Http\Authenticator\Passport\Passport; +use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport; -/** - * Class FrontApiClientAuthenticator - * - * @package RetailCrm\ServiceBundle\Security - */ class FrontApiClientAuthenticator extends AbstractClientAuthenticator { private $security; + private $repository; - /** - * FrontApiClientAuthenticator constructor. - * - * @param ErrorJsonResponseFactory $errorResponseFactory - * @param Security $security - */ public function __construct( ErrorJsonResponseFactory $errorResponseFactory, - Security $security + Security $security, + ConnectionRepository $repository ) { parent::__construct($errorResponseFactory); $this->security = $security; + $this->repository = $repository; } /** @@ -45,8 +42,15 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator /** * {@inheritdoc } */ - public function supportsRememberMe(): bool + public function authenticate(Request $request): Passport { - return true; + $identifier = $request->request->get(static::AUTH_FIELD); + + return new SelfValidatingPassport( + new UserBadge($identifier, function ($userIdentifier) { + return $this->repository->findByIdentifier($userIdentifier); + }), + [new RememberMeBadge()] + ); } } From 9ef87a2d3590e1755c7b9894a41cff63ab42716a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Tue, 19 Jul 2022 16:41:27 +0300 Subject: [PATCH 03/13] Add gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 7690d76..d0687f7 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ test-report.xml .idea coverage.xml +.docker +docker-compose* From f59162978676962fd6374a8e262c1f355d859294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 13:51:43 +0300 Subject: [PATCH 04/13] Update value resolvers --- ArgumentResolver/AbstractValueResolver.php | 21 +--------- ArgumentResolver/CallbackValueResolver.php | 34 +-------------- ArgumentResolver/ClientValueResolver.php | 41 +------------------ .../CallbackValueResolverTest.php | 8 +--- .../ClientValueResolverTest.php | 8 +--- ...rTest.php => JMSSerializerAdapterTest.php} | 0 6 files changed, 10 insertions(+), 102 deletions(-) rename Tests/Serializer/{JSMSerializerAdapterTest.php => JMSSerializerAdapterTest.php} (100%) diff --git a/ArgumentResolver/AbstractValueResolver.php b/ArgumentResolver/AbstractValueResolver.php index e840f02..272bbef 100644 --- a/ArgumentResolver/AbstractValueResolver.php +++ b/ArgumentResolver/AbstractValueResolver.php @@ -5,30 +5,13 @@ namespace RetailCrm\ServiceBundle\ArgumentResolver; use RetailCrm\ServiceBundle\Exceptions\InvalidRequestArgumentException; use Symfony\Component\Validator\Validator\ValidatorInterface; -/** - * Class AbstractValueResolver - * - * @package RetailCrm\ServiceBundle\ArgumentResolver - */ abstract class AbstractValueResolver { - protected $validator; - - /** - * AbstractValueResolver constructor. - * - * @param ValidatorInterface $validator - */ - public function __construct(ValidatorInterface $validator) + public function __construct( + protected ValidatorInterface $validator) { - $this->validator = $validator; } - /** - * @param object $data - * - * @return void - */ protected function validate(object $data): void { $errors = $this->validator->validate($data); diff --git a/ArgumentResolver/CallbackValueResolver.php b/ArgumentResolver/CallbackValueResolver.php index 3c412e5..cee8f18 100644 --- a/ArgumentResolver/CallbackValueResolver.php +++ b/ArgumentResolver/CallbackValueResolver.php @@ -9,37 +9,16 @@ use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; use Generator; use Symfony\Component\Validator\Validator\ValidatorInterface; -/** - * Class CallbackValueResolver - * - * @package RetailCrm\ServiceBundle\ArgumentResolver - */ class CallbackValueResolver extends AbstractValueResolver implements ArgumentValueResolverInterface { - private $serializer; - private $requestSchema; - - /** - * CallbackValueResolver constructor. - * - * @param Adapter $serializer - * @param ValidatorInterface $validator - * @param array $requestSchema - */ public function __construct( - Adapter $serializer, ValidatorInterface $validator, - array $requestSchema + private Adapter $serializer, + private array $requestSchema ) { parent::__construct($validator); - - $this->serializer = $serializer; - $this->requestSchema = $requestSchema; } - /** - * {@inheritdoc } - */ public function supports(Request $request, ArgumentMetadata $argument): bool { if (empty($this->requestSchema) || $request->getMethod() !== Request::METHOD_POST) { @@ -49,9 +28,6 @@ class CallbackValueResolver extends AbstractValueResolver implements ArgumentVal return null !== $this->search($request, $argument); } - /** - * {@inheritdoc } - */ public function resolve(Request $request, ArgumentMetadata $argument): Generator { $parameter = $this->search($request, $argument); @@ -61,12 +37,6 @@ class CallbackValueResolver extends AbstractValueResolver implements ArgumentVal yield $data; } - /** - * @param Request $request - * @param ArgumentMetadata $argument - * - * @return string|null - */ private function search(Request $request, ArgumentMetadata $argument): ?string { foreach ($this->requestSchema as $callback) { diff --git a/ArgumentResolver/ClientValueResolver.php b/ArgumentResolver/ClientValueResolver.php index 7d9ed18..ded400e 100644 --- a/ArgumentResolver/ClientValueResolver.php +++ b/ArgumentResolver/ClientValueResolver.php @@ -9,46 +9,21 @@ use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; use Symfony\Component\Validator\Validator\ValidatorInterface; use Generator; -/** - * Class ClientValueResolver - * - * @package RetailCrm\ServiceBundle\ArgumentResolver - */ class ClientValueResolver extends AbstractValueResolver implements ArgumentValueResolverInterface { - private $serializer; - private $requestSchema; - - /** - * ClientValueResolver constructor. - * - * - * @param Adapter $serializer - * @param ValidatorInterface $validator - * @param array $requestSchema - */ public function __construct( - Adapter $serializer, ValidatorInterface $validator, - array $requestSchema + private Adapter $serializer, + private array $requestSchema ) { parent::__construct($validator); - - $this->serializer = $serializer; - $this->requestSchema = $requestSchema; } - /** - * {@inheritdoc} - */ public function supports(Request $request, ArgumentMetadata $argument): bool { return in_array($argument->getType(), $this->requestSchema, true); } - /** - * {@inheritdoc} - */ public function resolve(Request $request, ArgumentMetadata $argument): Generator { if (Request::METHOD_GET === $request->getMethod()) { @@ -62,23 +37,11 @@ class ClientValueResolver extends AbstractValueResolver implements ArgumentValue yield $dto; } - /** - * @param array $data - * @param string $type - * - * @return object - */ private function handleGetData(array $data, string $type): object { return $this->serializer->arrayToObject($data, $type); } - /** - * @param string $data - * @param string $type - * - * @return object - */ private function handlePostData(string $data, string $type): object { return $this->serializer->deserialize($data, $type); diff --git a/Tests/ArgumentResolver/CallbackValueResolverTest.php b/Tests/ArgumentResolver/CallbackValueResolverTest.php index c2d0c52..240ebd0 100644 --- a/Tests/ArgumentResolver/CallbackValueResolverTest.php +++ b/Tests/ArgumentResolver/CallbackValueResolverTest.php @@ -15,11 +15,6 @@ use Symfony\Component\Serializer\Serializer; use Symfony\Component\Validator\Validation; use Generator; -/** - * Class CallbackValueResolverTest - * - * @package RetailCrm\ServiceBundle\Tests\ArgumentResolver - */ class CallbackValueResolverTest extends TestCase { private $resolver; @@ -28,10 +23,11 @@ class CallbackValueResolverTest extends TestCase { $serializer = new Serializer([new ObjectNormalizer()], [new JsonEncoder()]); $this->resolver = new CallbackValueResolver( - new SymfonySerializerAdapter($serializer, $serializer), Validation::createValidatorBuilder() ->enableAnnotationMapping() + ->addDefaultDoctrineAnnotationReader() ->getValidator(), + new SymfonySerializerAdapter($serializer, $serializer), [ [ 'type' => RequestDto::class, diff --git a/Tests/ArgumentResolver/ClientValueResolverTest.php b/Tests/ArgumentResolver/ClientValueResolverTest.php index d281863..c473941 100644 --- a/Tests/ArgumentResolver/ClientValueResolverTest.php +++ b/Tests/ArgumentResolver/ClientValueResolverTest.php @@ -15,11 +15,6 @@ use Symfony\Component\Serializer\Serializer; use Symfony\Component\Validator\Validation; use Generator; -/** - * Class ClientValueResolverTest - * - * @package RetailCrm\ServiceBundle\Tests\ArgumentResolver - */ class ClientValueResolverTest extends TestCase { private $resolver; @@ -28,10 +23,11 @@ class ClientValueResolverTest extends TestCase { $serializer = new Serializer([new ObjectNormalizer()], [new JsonEncoder()]); $this->resolver = new ClientValueResolver( - new SymfonySerializerAdapter($serializer, $serializer), Validation::createValidatorBuilder() ->enableAnnotationMapping() + ->addDefaultDoctrineAnnotationReader() ->getValidator(), + new SymfonySerializerAdapter($serializer, $serializer), [ RequestDto::class ] diff --git a/Tests/Serializer/JSMSerializerAdapterTest.php b/Tests/Serializer/JMSSerializerAdapterTest.php similarity index 100% rename from Tests/Serializer/JSMSerializerAdapterTest.php rename to Tests/Serializer/JMSSerializerAdapterTest.php From 422e86f22ebf26d59a4092385b63eecd806170eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 13:58:16 +0300 Subject: [PATCH 05/13] Update authenticators --- Security/AbstractClientAuthenticator.php | 12 -- Security/CallbackClientAuthenticator.php | 31 ++--- Security/FrontApiClientAuthenticator.php | 24 ++-- Tests/DataFixtures/User.php | 20 +-- .../CallbackClientAuthenticatorTest.php | 114 +++--------------- .../FrontApiClientAuthenticatorTest.php | 100 ++++----------- 6 files changed, 70 insertions(+), 231 deletions(-) diff --git a/Security/AbstractClientAuthenticator.php b/Security/AbstractClientAuthenticator.php index 386ac03..4aaafb8 100644 --- a/Security/AbstractClientAuthenticator.php +++ b/Security/AbstractClientAuthenticator.php @@ -22,19 +22,10 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator $this->errorResponseFactory = $errorResponseFactory; } - /** - * {@inheritdoc } - */ abstract public function supports(Request $request): ?bool; - /** - * {@inheritdoc } - */ abstract public function authenticate(Request $request): Passport; - /** - * {@inheritdoc } - */ public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response { $error = new Error(); @@ -43,9 +34,6 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator return $this->errorResponseFactory->create($error,Response::HTTP_FORBIDDEN); } - /** - * {@inheritdoc } - */ public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $providerKey): ?Response { return null; diff --git a/Security/CallbackClientAuthenticator.php b/Security/CallbackClientAuthenticator.php index 1fc51bb..ece82be 100644 --- a/Security/CallbackClientAuthenticator.php +++ b/Security/CallbackClientAuthenticator.php @@ -2,37 +2,38 @@ namespace RetailCrm\ServiceBundle\Security; +use Doctrine\Persistence\ObjectRepository; +use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Security\Core\Exception\AuthenticationException; +use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Passport; +use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport; class CallbackClientAuthenticator extends AbstractClientAuthenticator { - /** - * {@inheritdoc } - */ + public function __construct( + ErrorJsonResponseFactory $errorResponseFactory, + private ObjectRepository $repository, + ) { + parent::__construct($errorResponseFactory); + } + public function supports(Request $request): bool { return $request->request->has(static::AUTH_FIELD) || $request->query->has(static::AUTH_FIELD); } - /** - * {@inheritdoc } - */ - public function supportsRememberMe(): bool - { - return false; - } - - /** - * {@inheritdoc } - */ public function authenticate(Request $request): Passport { $identifier = $request->request->get(static::AUTH_FIELD); + if (null === $identifier) { + throw new AuthenticationException('Request does not contain authentication data'); + } return new SelfValidatingPassport( new UserBadge($identifier, function ($userIdentifier) { - return $this->repository->findByIdentifier($userIdentifier); + return $this->repository->findOneBy([static::AUTH_FIELD => $userIdentifier]); }), [] ); diff --git a/Security/FrontApiClientAuthenticator.php b/Security/FrontApiClientAuthenticator.php index c707f1a..a2a2e67 100644 --- a/Security/FrontApiClientAuthenticator.php +++ b/Security/FrontApiClientAuthenticator.php @@ -2,9 +2,10 @@ namespace RetailCrm\ServiceBundle\Security; -use App\Repository\ConnectionRepository; +use Doctrine\Persistence\ObjectRepository; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; @@ -13,23 +14,14 @@ use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPasspor class FrontApiClientAuthenticator extends AbstractClientAuthenticator { - private $security; - private $repository; - public function __construct( ErrorJsonResponseFactory $errorResponseFactory, - Security $security, - ConnectionRepository $repository + private Security $security, + private ObjectRepository $repository ) { parent::__construct($errorResponseFactory); - - $this->security = $security; - $this->repository = $repository; } - /** - * {@inheritdoc } - */ public function supports(Request $request): bool { if ($this->security->getUser()) { @@ -39,16 +31,16 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator return $request->request->has(static::AUTH_FIELD); } - /** - * {@inheritdoc } - */ public function authenticate(Request $request): Passport { $identifier = $request->request->get(static::AUTH_FIELD); + if (null === $identifier) { + throw new AuthenticationException('Request does not contain authentication data'); + } return new SelfValidatingPassport( new UserBadge($identifier, function ($userIdentifier) { - return $this->repository->findByIdentifier($userIdentifier); + return $this->repository->findOneBy([static::AUTH_FIELD => $userIdentifier]); }), [new RememberMeBadge()] ); diff --git a/Tests/DataFixtures/User.php b/Tests/DataFixtures/User.php index 8951ea5..ad17192 100644 --- a/Tests/DataFixtures/User.php +++ b/Tests/DataFixtures/User.php @@ -4,11 +4,6 @@ namespace RetailCrm\ServiceBundle\Tests\DataFixtures; use Symfony\Component\Security\Core\User\UserInterface; -/** - * Class User - * - * @package RetailCrm\ServiceBundle\Tests\DataFixtures - */ class User implements UserInterface { public function getRoles(): array @@ -16,16 +11,6 @@ class User implements UserInterface return ["USER"]; } - public function getPassword(): string - { - return "123"; - } - - public function getSalt(): string - { - return "salt"; - } - public function getUsername(): string { return "user"; @@ -34,4 +19,9 @@ class User implements UserInterface public function eraseCredentials(): void { } + + public function getUserIdentifier(): string + { + return 'identifier'; + } } diff --git a/Tests/Security/CallbackClientAuthenticatorTest.php b/Tests/Security/CallbackClientAuthenticatorTest.php index bc2f532..a604a21 100644 --- a/Tests/Security/CallbackClientAuthenticatorTest.php +++ b/Tests/Security/CallbackClientAuthenticatorTest.php @@ -2,6 +2,7 @@ namespace RetailCrm\ServiceBundle\Tests\Security; +use Doctrine\Persistence\ObjectRepository; use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator; @@ -11,83 +12,9 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; -use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\User\UserProviderInterface; -/** - * Class CallbackClientAuthenticatorTest - * - * @package RetailCrm\ServiceBundle\Tests\Security - */ class CallbackClientAuthenticatorTest extends TestCase { - public function testStart(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $errorResponseFactory - ->expects(static::once()) - ->method('create') - ->willReturn( - new JsonResponse(['message' => 'Authentication required'], Response::HTTP_UNAUTHORIZED) - ); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->start(new Request(), new AuthenticationException()); - - static::assertInstanceOf(JsonResponse::class, $result); - static::assertEquals(Response::HTTP_UNAUTHORIZED, $result->getStatusCode()); - } - - public function testGetCredentials(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->getCredentials(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertEquals('123', $result); - - $result = $auth->getCredentials(new Request([CallbackClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertEquals('123', $result); - } - - public function testCheckCredentials(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - - $user = new class implements UserInterface { - public function getRoles(): array - { - return ["USER"]; - } - - public function getPassword(): string - { - return "123"; - } - - public function getSalt(): string - { - return "salt"; - } - - public function getUsername(): string - { - return "user"; - } - - public function eraseCredentials(): void - { - } - }; - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->checkCredentials(new Request(), $user); - - static::assertTrue($result); - } - public function testOnAuthenticationFailure(): void { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); @@ -101,7 +28,8 @@ class CallbackClientAuthenticatorTest extends TestCase ) ); - $auth = new CallbackClientAuthenticator($errorResponseFactory); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); static::assertInstanceOf(JsonResponse::class, $result); @@ -112,7 +40,8 @@ class CallbackClientAuthenticatorTest extends TestCase { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); $result = $auth->supports(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($result); @@ -126,32 +55,26 @@ class CallbackClientAuthenticatorTest extends TestCase static::assertFalse($result); } - public function testSupportsRememberMe(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->supportsRememberMe(); - - static::assertFalse($result); - } - - public function testGetUser(): void + public function testAuthenticate(): void { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $user = new User(); - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $userProvider = $this->createMock(UserProviderInterface::class); - $userProvider + $userRepository = $this->createMock(ObjectRepository::class); + $userRepository ->expects(static::once()) - ->method('loadUserByUsername') - ->with('clientId') + ->method('findOneBy') ->willReturn($user) ; - $result = $auth->getUser('clientId', $userProvider); - static::assertEquals($user, $result); + $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); + + $passport = $auth->authenticate(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); + $authUser = $passport->getUser(); + static::assertEquals($user, $authUser); + + $this->expectException(AuthenticationException::class); + $auth->authenticate(new Request()); } public function testOnAuthenticationSuccess(): void @@ -159,7 +82,8 @@ class CallbackClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $request = $this->createMock(Request::class); $token = $this->createMock(TokenInterface::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); $result = $auth->onAuthenticationSuccess($request, $token, 'key'); diff --git a/Tests/Security/FrontApiClientAuthenticatorTest.php b/Tests/Security/FrontApiClientAuthenticatorTest.php index c57bf6d..219fb6a 100644 --- a/Tests/Security/FrontApiClientAuthenticatorTest.php +++ b/Tests/Security/FrontApiClientAuthenticatorTest.php @@ -2,6 +2,7 @@ namespace RetailCrm\ServiceBundle\Tests\Security; +use Doctrine\Persistence\ObjectRepository; use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; @@ -12,59 +13,9 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; -use Symfony\Component\Security\Core\User\UserProviderInterface; -/** - * Class FrontApiClientAuthenticatorTest - * - * @package RetailCrm\ServiceBundle\Tests\Security - */ class FrontApiClientAuthenticatorTest extends TestCase { - public function testStart(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $errorResponseFactory - ->expects(static::once()) - ->method('create') - ->willReturn( - new JsonResponse(['message' => 'Authentication required'], Response::HTTP_UNAUTHORIZED) - ); - $security = $this->createMock(Security::class); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->start(new Request(), new AuthenticationException()); - - static::assertInstanceOf(JsonResponse::class, $result); - static::assertEquals(Response::HTTP_UNAUTHORIZED, $result->getStatusCode()); - } - - public function testGetCredentials(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $security = $this->createMock(Security::class); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->getCredentials(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertEquals('123', $result); - - $result = $auth->getCredentials(new Request([FrontApiClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertEquals('123', $result); - } - - public function testCheckCredentials(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $security = $this->createMock(Security::class); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->checkCredentials(new Request(), new User()); - - static::assertTrue($result); - } - public function testOnAuthenticationFailure(): void { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); @@ -78,9 +29,9 @@ class FrontApiClientAuthenticatorTest extends TestCase ) ); $security = $this->createMock(Security::class); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->start(new Request(), new AuthenticationException()); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); static::assertInstanceOf(JsonResponse::class, $result); static::assertEquals(Response::HTTP_FORBIDDEN, $result->getStatusCode()); @@ -91,8 +42,8 @@ class FrontApiClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(new User()); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); $result = $auth->supports(new Request()); static::assertFalse($result); @@ -103,42 +54,34 @@ class FrontApiClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(null); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); $result = $auth->supports(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($result); } - public function testSupportsRememberMe(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $security = $this->createMock(Security::class); - - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->supportsRememberMe(); - - static::assertTrue($result); - } - - public function testGetUser(): void + public function testAuthenticate(): void { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $user = new User(); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - - $userProvider = $this->createMock(UserProviderInterface::class); - $userProvider + $userRepository = $this->createMock(ObjectRepository::class); + $userRepository ->expects(static::once()) - ->method('loadUserByUsername') - ->with('clientId') + ->method('findOneBy') + ->with([FrontApiClientAuthenticator::AUTH_FIELD => '123']) ->willReturn($user) ; + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); - $result = $auth->getUser('clientId', $userProvider); - static::assertEquals($user, $result); + $passport = $auth->authenticate(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); + $authUser = $passport->getUser(); + static::assertEquals($user, $authUser); + + $this->expectException(AuthenticationException::class); + $auth->authenticate(new Request()); } public function testOnAuthenticationSuccess(): void @@ -147,7 +90,8 @@ class FrontApiClientAuthenticatorTest extends TestCase $security = $this->createMock(Security::class); $request = $this->createMock(Request::class); $token = $this->createMock(TokenInterface::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $userRepository = $this->createMock(ObjectRepository::class); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); $result = $auth->onAuthenticationSuccess($request, $token, 'key'); From 22c3971bc84004851aa9cb0b9d7e05c49292c62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 13:58:56 +0300 Subject: [PATCH 06/13] Add doctrine bundle --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df97eb1..0b2c2ac 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "symfony/messenger": "^5.4|^6.0", "symfony/process": "^5.4|^6.0", "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0" + "symfony/lock": "^5.4|^6.0", + "doctrine/doctrine-bundle": "^2.6" }, "autoload": { "psr-4": { From 897df39d96b5e3407fa7c54ce23d97e5015a5c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 14:38:42 +0300 Subject: [PATCH 07/13] Update code base --- DependencyInjection/Configuration.php | 8 ---- .../RetailCrmServiceExtension.php | 9 ---- .../InvalidRequestArgumentException.php | 19 +------- Messenger/CommandMessage.php | 48 ++----------------- Messenger/MessageHandler.php | 20 +------- .../MessageHandler/InNewProcessRunner.php | 35 ++------------ Messenger/MessageHandler/JobRunner.php | 8 ---- .../MessageHandler/SimpleConsoleRunner.php | 28 +---------- Messenger/Middleware/LockableMessage.php | 5 -- .../Middleware/LockableMessageMiddleware.php | 23 +-------- Models/Error.php | 20 ++------ Response/ErrorJsonResponseFactory.php | 22 +-------- Serializer/Adapter.php | 19 -------- Serializer/JMSSerializerAdapter.php | 28 +---------- Serializer/SymfonySerializerAdapter.php | 28 +---------- Tests/DataFixtures/RequestDto.php | 8 +--- .../DependencyInjection/ConfigurationTest.php | 5 -- .../RetailCrmServiceExtensionTest.php | 5 -- Tests/Fixtures/App/Kernel.php | 9 +--- Tests/Messenger/CommandMessageTest.php | 5 -- .../MessageHandler/InNewProcessRunnerTest.php | 5 -- .../SimpleConsoleRunnerTest.php | 5 -- Tests/Messenger/MessageHandlerTest.php | 5 -- .../LockableMessageMiddlewareTest.php | 18 ++----- Tests/Serializer/JMSSerializerAdapterTest.php | 2 +- 25 files changed, 28 insertions(+), 359 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 96d7c6b..12f5fdf 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -5,16 +5,8 @@ namespace RetailCrm\ServiceBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; -/** - * Class Configuration - * - * @package RetailCrm\ServiceBundle\DependencyInjection - */ class Configuration implements ConfigurationInterface { - /** - * {@inheritdoc } - */ public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('retail_crm_service'); diff --git a/DependencyInjection/RetailCrmServiceExtension.php b/DependencyInjection/RetailCrmServiceExtension.php index 4e27c45..10d7805 100644 --- a/DependencyInjection/RetailCrmServiceExtension.php +++ b/DependencyInjection/RetailCrmServiceExtension.php @@ -14,17 +14,8 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Reference; -/** - * Class RetailCrmServiceExtension - * - * @package RetailCrm\ServiceBundle\DependencyInjection - */ class RetailCrmServiceExtension extends Extension { - /** - * @param array $configs - * @param ContainerBuilder $container - */ public function load(array $configs, ContainerBuilder $container): void { $configuration = $this->getConfiguration($configs, $container); diff --git a/Exceptions/InvalidRequestArgumentException.php b/Exceptions/InvalidRequestArgumentException.php index 4d990f1..2d8403e 100644 --- a/Exceptions/InvalidRequestArgumentException.php +++ b/Exceptions/InvalidRequestArgumentException.php @@ -5,33 +5,18 @@ namespace RetailCrm\ServiceBundle\Exceptions; use InvalidArgumentException; use Throwable; -/** - * Class InvalidRequestArgumentException - * - * @package RetailCrm\ServiceBundle\Exceptions - */ class InvalidRequestArgumentException extends InvalidArgumentException { private $validateErrors; - /** - * InvalidRequestArgumentException constructor. - * @param string $message - * @param int $code - * @param array $errors - * @param Throwable|null $previous - */ - public function __construct($message = "", $code = 0, iterable $errors = [], Throwable $previous = null) + public function __construct(string $message = "", int $code = 0, array $errors = [], Throwable $previous = null) { parent::__construct($message, $code, $previous); $this->validateErrors = $errors; } - /** - * @return iterable - */ - public function getValidateErrors(): iterable + public function getValidateErrors(): array { return $this->validateErrors; } diff --git a/Messenger/CommandMessage.php b/Messenger/CommandMessage.php index 139030f..abb9a4d 100644 --- a/Messenger/CommandMessage.php +++ b/Messenger/CommandMessage.php @@ -2,91 +2,54 @@ namespace RetailCrm\ServiceBundle\Messenger; -/** - * Class Message - * - * @package RetailCrm\ServiceBundle\Messenger - */ abstract class CommandMessage { - /** @var string */ - protected $commandName; + protected string $commandName; - /** @var array */ - protected $options = []; + protected array $options = []; - /** @var array */ - protected $arguments = []; + protected array $arguments = []; - /** - * @return string - */ public function getCommandName(): string { return $this->commandName; } - /** - * @param string $commandName - */ public function setCommandName(string $commandName): void { $this->commandName = $commandName; } - /** - * @return array - */ public function getOptions(): array { return $this->options; } - /** - * @param array $options - */ public function setOptions(array $options): void { $this->options = $options; } - /** - * @return array - */ public function getArguments(): array { return $this->arguments; } - /** - * @param array $arguments - */ public function setArguments(array $arguments): void { $this->arguments = $arguments; } - /** - * @param string $key - * @param string $value - */ public function addOption(string $key, string $value): void { $this->options[$key] = $value; } - /** - * @param string $key - * @param string $value - */ public function addArgument(string $key, string $value): void { $this->arguments[$key] = $value; } - /** - * @return array - */ public function getFormattedOptions(): array { $options = []; @@ -97,11 +60,6 @@ abstract class CommandMessage return $options; } - /** - * For lockable message - * - * @return array - */ public function __serialize(): array { return [ diff --git a/Messenger/MessageHandler.php b/Messenger/MessageHandler.php index 6f38fa3..9cb94e0 100644 --- a/Messenger/MessageHandler.php +++ b/Messenger/MessageHandler.php @@ -6,31 +6,13 @@ use RetailCrm\ServiceBundle\Messenger\MessageHandler\JobRunner; use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Exception; -/** - * Class MessageHandler - * - * @package RetailCrm\ServiceBundle\Messenger - */ class MessageHandler implements MessageHandlerInterface { - /** - * @var JobRunner - */ - private $runner; - - /** - * CommandQueueHandler constructor. - * - * @param JobRunner $runner - */ - public function __construct(JobRunner $runner) + public function __construct(private JobRunner $runner) { - $this->runner = $runner; } /** - * @param CommandMessage $message - * * @throws Exception */ public function __invoke(CommandMessage $message): void diff --git a/Messenger/MessageHandler/InNewProcessRunner.php b/Messenger/MessageHandler/InNewProcessRunner.php index da0abff..1b5dedd 100644 --- a/Messenger/MessageHandler/InNewProcessRunner.php +++ b/Messenger/MessageHandler/InNewProcessRunner.php @@ -9,38 +9,17 @@ use Symfony\Component\Process\Exception\ProcessTimedOutException; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; -/** - * Class InNewProcessRunner - * - * @package RetailCrm\ServiceBundle\Messenger\MessageHandler - */ class InNewProcessRunner implements JobRunner { /** @var int Default timeout for process */ public const DEFAULT_TIMEOUT = 3600; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; - /** - * @var KernelInterface - */ - private $kernel; + private KernelInterface $kernel; - /** - * @var int - */ - private $timeout = self::DEFAULT_TIMEOUT; + private int $timeout = self::DEFAULT_TIMEOUT; - /** - * CommandQueueHandler constructor. - * - * @param LoggerInterface $logger - * @param KernelInterface $kernel - * @param int|null $timeout - */ public function __construct( LoggerInterface $logger, KernelInterface $kernel, @@ -54,9 +33,6 @@ class InNewProcessRunner implements JobRunner } } - /** - * {@inheritdoc} - */ public function run(CommandMessage $message): void { $phpBinaryPath = (new PhpExecutableFinder)->find(); @@ -92,11 +68,6 @@ class InNewProcessRunner implements JobRunner } } - /** - * @param CommandMessage $message - * - * @return array - */ private function getOptions(CommandMessage $message): array { $options = []; diff --git a/Messenger/MessageHandler/JobRunner.php b/Messenger/MessageHandler/JobRunner.php index 350e847..38a4dd8 100644 --- a/Messenger/MessageHandler/JobRunner.php +++ b/Messenger/MessageHandler/JobRunner.php @@ -4,15 +4,7 @@ namespace RetailCrm\ServiceBundle\Messenger\MessageHandler; use RetailCrm\ServiceBundle\Messenger\CommandMessage; -/** - * Interface JobRunner - * - * @package RetailCrm\ServiceBundle\Messenger\MessageHandler - */ interface JobRunner { - /** - * @param CommandMessage $message - */ public function run(CommandMessage $message): void; } diff --git a/Messenger/MessageHandler/SimpleConsoleRunner.php b/Messenger/MessageHandler/SimpleConsoleRunner.php index 0291d8d..c50aaae 100644 --- a/Messenger/MessageHandler/SimpleConsoleRunner.php +++ b/Messenger/MessageHandler/SimpleConsoleRunner.php @@ -9,38 +9,12 @@ use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\BufferedOutput; use Symfony\Component\HttpKernel\KernelInterface; -/** - * Class SimpleConsoleRunner - * - * @package RetailCrm\ServiceBundle\Messenger\MessageHandler - */ class SimpleConsoleRunner implements JobRunner { - /** - * @var LoggerInterface - */ - private $logger; - - /** - * @var KernelInterface - */ - private $kernel; - - /** - * CommandQueueHandler constructor. - * - * @param LoggerInterface $logger - * @param KernelInterface $kernel - */ - public function __construct(LoggerInterface $logger, KernelInterface $kernel) + public function __construct(private LoggerInterface $logger, private KernelInterface $kernel) { - $this->logger = $logger; - $this->kernel = $kernel; } - /** - * {@inheritdoc} - */ public function run(CommandMessage $message): void { $application = new Application($this->kernel); diff --git a/Messenger/Middleware/LockableMessage.php b/Messenger/Middleware/LockableMessage.php index 9550df3..4e49597 100644 --- a/Messenger/Middleware/LockableMessage.php +++ b/Messenger/Middleware/LockableMessage.php @@ -2,11 +2,6 @@ namespace RetailCrm\ServiceBundle\Messenger\Middleware; -/** - * Interface LockableMessage - * - * @package RetailCrm\ServiceBundle\Messenger\Middleware - */ interface LockableMessage { public function __serialize(): array; diff --git a/Messenger/Middleware/LockableMessageMiddleware.php b/Messenger/Middleware/LockableMessageMiddleware.php index 0718567..512852f 100644 --- a/Messenger/Middleware/LockableMessageMiddleware.php +++ b/Messenger/Middleware/LockableMessageMiddleware.php @@ -9,29 +9,13 @@ use Symfony\Component\Messenger\Middleware\StackInterface; use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Throwable; -/** - * Class LockableMessageMiddleware - * - * @package RetailCrm\ServiceBundle\Messenger\Middleware - */ class LockableMessageMiddleware implements MiddlewareInterface { - /** - * @var LockFactory - */ - private $lockFactory; - - public function __construct(LockFactory $lockFactory) + public function __construct(private LockFactory $lockFactory) { - $this->lockFactory = $lockFactory; } /** - * @param Envelope $envelope - * @param StackInterface $stack - * - * @return Envelope - * * @throws Throwable */ public function handle(Envelope $envelope, StackInterface $stack): Envelope @@ -56,11 +40,6 @@ class LockableMessageMiddleware implements MiddlewareInterface return $stack->next()->handle($envelope, $stack); } - /** - * @param LockableMessage $message - * - * @return string - */ private function objectHash(LockableMessage $message): string { return hash('crc32', serialize($message)); diff --git a/Models/Error.php b/Models/Error.php index ef6c462..ae63d87 100644 --- a/Models/Error.php +++ b/Models/Error.php @@ -2,25 +2,11 @@ namespace RetailCrm\ServiceBundle\Models; -/** - * Class Error - * - * @package RetailCrm\ServiceBundle\Models - */ class Error { - /** - * @var string - */ - public $code; + public string $code; - /** - * @var string - */ - public $message; + public string $message; - /** - * @var array - */ - public $details; + public array $details; } diff --git a/Response/ErrorJsonResponseFactory.php b/Response/ErrorJsonResponseFactory.php index 76bbcf5..f59e3c2 100644 --- a/Response/ErrorJsonResponseFactory.php +++ b/Response/ErrorJsonResponseFactory.php @@ -7,32 +7,12 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Serializer\SerializerInterface; -/** - * Class ErrorJsonResponseFactory - * - * @package RetailCrm\ServiceBundle\Response - */ class ErrorJsonResponseFactory { - private $serializer; - - /** - * ErrorJsonResponseFactory constructor. - * - * @param SerializerInterface $serializer - */ - public function __construct(SerializerInterface $serializer) + public function __construct(private SerializerInterface $serializer) { - $this->serializer = $serializer; } - /** - * @param Error $error - * @param int $statusCode - * @param array $headers - * - * @return Response - */ public function create(Error $error, int $statusCode = Response::HTTP_BAD_REQUEST, array $headers = []): Response { return JsonResponse::fromJsonString( diff --git a/Serializer/Adapter.php b/Serializer/Adapter.php index 5c797d4..701d0cb 100644 --- a/Serializer/Adapter.php +++ b/Serializer/Adapter.php @@ -2,28 +2,9 @@ namespace RetailCrm\ServiceBundle\Serializer; -/** - * Interface Adapter - * - * @package RetailCrm\ServiceBundle\Serializer - */ interface Adapter { - /** - * @param string $data - * @param string $type - * @param string $format - * - * @return object - */ public function deserialize(string $data, string $type, string $format = 'json'): object; - /** - * @param array $data - * @param string $type - * @param string|null $format - * - * @return object - */ public function arrayToObject(array $data, string $type, ?string $format = null): object; } diff --git a/Serializer/JMSSerializerAdapter.php b/Serializer/JMSSerializerAdapter.php index 6099e45..9e7947a 100644 --- a/Serializer/JMSSerializerAdapter.php +++ b/Serializer/JMSSerializerAdapter.php @@ -6,50 +6,26 @@ use JMS\Serializer\ArrayTransformerInterface; use JMS\Serializer\Context; use JMS\Serializer\SerializerInterface; -/** - * Class JMSSerializerAdapter - * - * @package RetailCrm\ServiceBundle\Serializer - */ class JMSSerializerAdapter implements Adapter { - private $serializer; - private $transformer; private $context; - /** - * JMSSerializerAdapter constructor. - * - * @param SerializerInterface $serializer - * @param ArrayTransformerInterface $transformer - */ public function __construct( - SerializerInterface $serializer, - ArrayTransformerInterface $transformer + private SerializerInterface $serializer, + private ArrayTransformerInterface $transformer ) { - $this->serializer = $serializer; - $this->transformer = $transformer; } - /** - * {@inheritdoc } - */ public function deserialize(string $data, string $type, string $format = 'json'): object { return $this->serializer->deserialize($data, $type, $format, $this->context); } - /** - * {@inheritdoc } - */ public function arrayToObject(array $data, string $type, ?string $format = null): object { return $this->transformer->fromArray($data, $type, $this->context); } - /** - * @param Context $context - */ public function setContext(Context $context): void { $this->context = $context; diff --git a/Serializer/SymfonySerializerAdapter.php b/Serializer/SymfonySerializerAdapter.php index fdb4a85..6140efa 100644 --- a/Serializer/SymfonySerializerAdapter.php +++ b/Serializer/SymfonySerializerAdapter.php @@ -5,48 +5,24 @@ namespace RetailCrm\ServiceBundle\Serializer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\SerializerInterface; -/** - * Class SymfonySerializerAdapter - * - * @package RetailCrm\ServiceBundle\Serializer - */ class SymfonySerializerAdapter implements Adapter { - private $serializer; - private $denormalizer; - private $context = []; + private array $context = []; - /** - * SymfonySerializerAdapter constructor. - * - * @param SerializerInterface $serializer - * @param DenormalizerInterface $denormalizer - */ - public function __construct(SerializerInterface $serializer, DenormalizerInterface $denormalizer) + public function __construct(private SerializerInterface $serializer, private DenormalizerInterface $denormalizer) { - $this->serializer = $serializer; - $this->denormalizer = $denormalizer; } - /** - * {@inheritdoc } - */ public function deserialize(string $data, string $type,string $format = 'json'): object { return $this->serializer->deserialize($data, $type, $format, $this->context); } - /** - * {@inheritdoc } - */ public function arrayToObject(array $data, string $type, string $format = null): object { return $this->denormalizer->denormalize($data, $type, $format, $this->context); } - /** - * @param array $context - */ public function setContext(array $context): void { $this->context = $context; diff --git a/Tests/DataFixtures/RequestDto.php b/Tests/DataFixtures/RequestDto.php index 84b16ba..0d68722 100644 --- a/Tests/DataFixtures/RequestDto.php +++ b/Tests/DataFixtures/RequestDto.php @@ -5,17 +5,11 @@ namespace RetailCrm\ServiceBundle\Tests\DataFixtures; use Symfony\Component\Validator\Constraints as Assert; use JMS\Serializer\Annotation as JMS; -/** - * Class RequestDto - * - * @package RetailCrm\ServiceBundle\Tests\DataFixtures - */ class RequestDto { /** - * @var string * @Assert\NotNull() * @JMS\Type("string") */ - public $param; + public string $param; } diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php index 1468dde..41a68ed 100644 --- a/Tests/DependencyInjection/ConfigurationTest.php +++ b/Tests/DependencyInjection/ConfigurationTest.php @@ -6,11 +6,6 @@ use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\DependencyInjection\Configuration; use Symfony\Component\Config\Definition\Processor; -/** - * Class ConfigurationTest - * - * @package RetailCrm\ServiceBundle\Tests\DependencyInjection - */ class ConfigurationTest extends TestCase { public function testConfig(): void diff --git a/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php b/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php index 75141e7..7c2ebaf 100644 --- a/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php +++ b/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php @@ -12,11 +12,6 @@ use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag; -/** - * Class RetailCrmServiceExtensionTest - * - * @package RetailCrm\ServiceBundle\Tests\DependencyInjection - */ class RetailCrmServiceExtensionTest extends TestCase { private $container; diff --git a/Tests/Fixtures/App/Kernel.php b/Tests/Fixtures/App/Kernel.php index d10c683..9ee7229 100644 --- a/Tests/Fixtures/App/Kernel.php +++ b/Tests/Fixtures/App/Kernel.php @@ -3,21 +3,20 @@ namespace RetailCrm\ServiceBundle\Tests\Fixtures\App; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; class Kernel extends \Symfony\Component\HttpKernel\Kernel { use MicroKernelTrait; - public function registerBundles() + public function registerBundles(): array { return [ new \Symfony\Bundle\FrameworkBundle\FrameworkBundle() ]; } - protected function configureContainer(ContainerBuilder $container/*, LoaderInterface $loader*/): void + protected function configureContainer(ContainerBuilder $container): void { $container ->register(TestCommand::class, TestCommand::class) @@ -26,8 +25,4 @@ class Kernel extends \Symfony\Component\HttpKernel\Kernel $container->setParameter('kernel.project_dir', __DIR__ . '/..'); } - -// public function registerContainerConfiguration(LoaderInterface $loader) -// { -// } } diff --git a/Tests/Messenger/CommandMessageTest.php b/Tests/Messenger/CommandMessageTest.php index fdd13b1..d982772 100644 --- a/Tests/Messenger/CommandMessageTest.php +++ b/Tests/Messenger/CommandMessageTest.php @@ -5,11 +5,6 @@ namespace RetailCrm\ServiceBundle\Tests\Messenger; use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\Tests\DataFixtures\TestMessage; -/** - * Class CommandMessageTest - * - * @package RetailCrm\ServiceBundle\Tests\Messenger - */ class CommandMessageTest extends TestCase { public function testMessage(): void diff --git a/Tests/Messenger/MessageHandler/InNewProcessRunnerTest.php b/Tests/Messenger/MessageHandler/InNewProcessRunnerTest.php index cada1a3..38b8507 100644 --- a/Tests/Messenger/MessageHandler/InNewProcessRunnerTest.php +++ b/Tests/Messenger/MessageHandler/InNewProcessRunnerTest.php @@ -7,11 +7,6 @@ use RetailCrm\ServiceBundle\Messenger\MessageHandler\InNewProcessRunner; use RetailCrm\ServiceBundle\Tests\Fixtures\App\TestCommandMessage; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; -/** - * Class InNewProcessRunnerTest - * - * @package RetailCrm\ServiceBundle\Tests\Messenger\MessageHandler - */ class InNewProcessRunnerTest extends KernelTestCase { protected function setUp(): void diff --git a/Tests/Messenger/MessageHandler/SimpleConsoleRunnerTest.php b/Tests/Messenger/MessageHandler/SimpleConsoleRunnerTest.php index d5256b7..f279d52 100644 --- a/Tests/Messenger/MessageHandler/SimpleConsoleRunnerTest.php +++ b/Tests/Messenger/MessageHandler/SimpleConsoleRunnerTest.php @@ -7,11 +7,6 @@ use RetailCrm\ServiceBundle\Messenger\MessageHandler\SimpleConsoleRunner; use RetailCrm\ServiceBundle\Tests\Fixtures\App\TestCommandMessage; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; -/** - * Class SimpleConsoleRunnerTest - * - * @package RetailCrm\ServiceBundle\Tests\Messenger\MessageHandler - */ class SimpleConsoleRunnerTest extends KernelTestCase { protected function setUp(): void diff --git a/Tests/Messenger/MessageHandlerTest.php b/Tests/Messenger/MessageHandlerTest.php index 1f66d97..0aba92c 100644 --- a/Tests/Messenger/MessageHandlerTest.php +++ b/Tests/Messenger/MessageHandlerTest.php @@ -7,11 +7,6 @@ use RetailCrm\ServiceBundle\Messenger\CommandMessage; use RetailCrm\ServiceBundle\Messenger\MessageHandler; use RetailCrm\ServiceBundle\Messenger\MessageHandler\JobRunner; -/** - * Class MessageHandlerTest - * - * @package RetailCrm\ServiceBundle\Tests\Messenger - */ class MessageHandlerTest extends TestCase { public function testRun(): void diff --git a/Tests/Messenger/Middleware/LockableMessageMiddlewareTest.php b/Tests/Messenger/Middleware/LockableMessageMiddlewareTest.php index ea74f78..69cc693 100644 --- a/Tests/Messenger/Middleware/LockableMessageMiddlewareTest.php +++ b/Tests/Messenger/Middleware/LockableMessageMiddlewareTest.php @@ -15,17 +15,9 @@ use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Middleware\StackInterface; use Symfony\Component\Messenger\Stamp\ReceivedStamp; -/** - * Class LockableMessageMiddlewareTest - * - * @package RetailCrm\ServiceBundle\Tests\Messenger\Middleware - */ class LockableMessageMiddlewareTest extends TestCase { - /** - * @var LockFactory - */ - private $lockFactory; + private LockFactory $lockFactory; protected function setUp(): void { @@ -35,7 +27,7 @@ class LockableMessageMiddlewareTest extends TestCase public function testHandle(): void { $store = $this->createMock(PersistingStoreInterface::class); - $key = new Key(uniqid()); + $key = new Key(uniqid('', true)); $lock = new Lock($key, $store); $this->lockFactory->expects(static::once())->method('createLock')->willReturn($lock); $envelope = new Envelope(new TestMessage(), [new ReceivedStamp('test')]); @@ -55,7 +47,7 @@ class LockableMessageMiddlewareTest extends TestCase { $store = $this->createMock(PersistingStoreInterface::class); $store->method('save')->willThrowException(new LockConflictedException); - $key = new Key(uniqid()); + $key = new Key(uniqid('', true)); $lock = new Lock($key, $store); $this->lockFactory->expects(static::once())->method('createLock')->willReturn($lock); $envelope = new Envelope(new TestMessage(), [new ReceivedStamp('test')]); @@ -75,7 +67,7 @@ class LockableMessageMiddlewareTest extends TestCase { $store = $this->createMock(PersistingStoreInterface::class); $store->method('save')->willThrowException(new LockConflictedException); - $key = new Key(uniqid()); + $key = new Key(uniqid('', true)); $lock = new Lock($key, $store); $this->lockFactory->expects(static::never())->method('createLock')->willReturn($lock); $envelope = new Envelope(new \stdClass(), [new ReceivedStamp('test')]); @@ -95,7 +87,7 @@ class LockableMessageMiddlewareTest extends TestCase { $store = $this->createMock(PersistingStoreInterface::class); $store->method('save')->willThrowException(new LockConflictedException); - $key = new Key(uniqid()); + $key = new Key(uniqid('', true)); $lock = new Lock($key, $store); $this->lockFactory->expects(static::never())->method('createLock')->willReturn($lock); $envelope = new Envelope(new TestMessage()); diff --git a/Tests/Serializer/JMSSerializerAdapterTest.php b/Tests/Serializer/JMSSerializerAdapterTest.php index 1c7a1a4..9ea7e14 100644 --- a/Tests/Serializer/JMSSerializerAdapterTest.php +++ b/Tests/Serializer/JMSSerializerAdapterTest.php @@ -7,7 +7,7 @@ use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\Serializer\JMSSerializerAdapter; use RetailCrm\ServiceBundle\Tests\DataFixtures\RequestDto; -class JSMSerializerAdapterTest extends TestCase +class JMSSerializerAdapterTest extends TestCase { private $serializer; private $transformer; From 430c5d9d4ac5db015d2391d1d0de8a1770f3940a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 14:54:24 +0300 Subject: [PATCH 08/13] Fix errors --- Exceptions/InvalidRequestArgumentException.php | 4 ++-- Models/Error.php | 15 ++++++++++++--- Security/AbstractClientAuthenticator.php | 5 +---- Tests/DataFixtures/RequestDto.php | 3 ++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Exceptions/InvalidRequestArgumentException.php b/Exceptions/InvalidRequestArgumentException.php index 2d8403e..e3ebf48 100644 --- a/Exceptions/InvalidRequestArgumentException.php +++ b/Exceptions/InvalidRequestArgumentException.php @@ -9,14 +9,14 @@ class InvalidRequestArgumentException extends InvalidArgumentException { private $validateErrors; - public function __construct(string $message = "", int $code = 0, array $errors = [], Throwable $previous = null) + public function __construct(string $message = "", int $code = 0, iterable $errors = [], Throwable $previous = null) { parent::__construct($message, $code, $previous); $this->validateErrors = $errors; } - public function getValidateErrors(): array + public function getValidateErrors(): iterable { return $this->validateErrors; } diff --git a/Models/Error.php b/Models/Error.php index ae63d87..b82b62d 100644 --- a/Models/Error.php +++ b/Models/Error.php @@ -4,9 +4,18 @@ namespace RetailCrm\ServiceBundle\Models; class Error { - public string $code; + /** + * @var string + */ + public $code; - public string $message; + /** + * @var string + */ + public $message; - public array $details; + /** + * @var array + */ + public $details; } diff --git a/Security/AbstractClientAuthenticator.php b/Security/AbstractClientAuthenticator.php index 4aaafb8..500f65d 100644 --- a/Security/AbstractClientAuthenticator.php +++ b/Security/AbstractClientAuthenticator.php @@ -15,11 +15,8 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator { public const AUTH_FIELD = 'clientId'; - private $errorResponseFactory; - - public function __construct(ErrorJsonResponseFactory $errorResponseFactory) + public function __construct(private ErrorJsonResponseFactory $errorResponseFactory) { - $this->errorResponseFactory = $errorResponseFactory; } abstract public function supports(Request $request): ?bool; diff --git a/Tests/DataFixtures/RequestDto.php b/Tests/DataFixtures/RequestDto.php index 0d68722..ee1599c 100644 --- a/Tests/DataFixtures/RequestDto.php +++ b/Tests/DataFixtures/RequestDto.php @@ -8,8 +8,9 @@ use JMS\Serializer\Annotation as JMS; class RequestDto { /** + * @var string * @Assert\NotNull() * @JMS\Type("string") */ - public string $param; + public $param; } From 6243bd12618b743017e499bfdb5d6eb12caff2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 20 Jul 2022 16:25:53 +0300 Subject: [PATCH 09/13] Add setUserRepository methods to authenticators --- Security/AbstractClientAuthenticator.php | 8 ++++++++ Security/CallbackClientAuthenticator.php | 16 ++++------------ Security/FrontApiClientAuthenticator.php | 9 ++++----- .../CallbackClientAuthenticatorTest.php | 12 +++++------- .../FrontApiClientAuthenticatorTest.php | 17 ++++++++--------- 5 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Security/AbstractClientAuthenticator.php b/Security/AbstractClientAuthenticator.php index 500f65d..f7a809b 100644 --- a/Security/AbstractClientAuthenticator.php +++ b/Security/AbstractClientAuthenticator.php @@ -2,6 +2,7 @@ namespace RetailCrm\ServiceBundle\Security; +use Doctrine\Persistence\ObjectRepository; use RetailCrm\ServiceBundle\Models\Error; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; @@ -15,6 +16,8 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator { public const AUTH_FIELD = 'clientId'; + protected ObjectRepository $userRepository; + public function __construct(private ErrorJsonResponseFactory $errorResponseFactory) { } @@ -35,4 +38,9 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator { return null; } + + public function setUserRepository(ObjectRepository $userRepository): void + { + $this->userRepository = $userRepository; + } } diff --git a/Security/CallbackClientAuthenticator.php b/Security/CallbackClientAuthenticator.php index ece82be..eb3711f 100644 --- a/Security/CallbackClientAuthenticator.php +++ b/Security/CallbackClientAuthenticator.php @@ -2,8 +2,6 @@ namespace RetailCrm\ServiceBundle\Security; -use Doctrine\Persistence\ObjectRepository; -use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; @@ -12,13 +10,6 @@ use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPasspor class CallbackClientAuthenticator extends AbstractClientAuthenticator { - public function __construct( - ErrorJsonResponseFactory $errorResponseFactory, - private ObjectRepository $repository, - ) { - parent::__construct($errorResponseFactory); - } - public function supports(Request $request): bool { return $request->request->has(static::AUTH_FIELD) || $request->query->has(static::AUTH_FIELD); @@ -32,9 +23,10 @@ class CallbackClientAuthenticator extends AbstractClientAuthenticator } return new SelfValidatingPassport( - new UserBadge($identifier, function ($userIdentifier) { - return $this->repository->findOneBy([static::AUTH_FIELD => $userIdentifier]); - }), + new UserBadge( + $identifier, + fn ($userIdentifier) => $this->userRepository->findOneBy([static::AUTH_FIELD => $userIdentifier]) + ), [] ); } diff --git a/Security/FrontApiClientAuthenticator.php b/Security/FrontApiClientAuthenticator.php index a2a2e67..b92f3f9 100644 --- a/Security/FrontApiClientAuthenticator.php +++ b/Security/FrontApiClientAuthenticator.php @@ -2,7 +2,6 @@ namespace RetailCrm\ServiceBundle\Security; -use Doctrine\Persistence\ObjectRepository; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Exception\AuthenticationException; @@ -17,7 +16,6 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator public function __construct( ErrorJsonResponseFactory $errorResponseFactory, private Security $security, - private ObjectRepository $repository ) { parent::__construct($errorResponseFactory); } @@ -39,9 +37,10 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator } return new SelfValidatingPassport( - new UserBadge($identifier, function ($userIdentifier) { - return $this->repository->findOneBy([static::AUTH_FIELD => $userIdentifier]); - }), + new UserBadge( + $identifier, + fn ($userIdentifier) => $this->userRepository->findOneBy([static::AUTH_FIELD => $userIdentifier]), + ), [new RememberMeBadge()] ); } diff --git a/Tests/Security/CallbackClientAuthenticatorTest.php b/Tests/Security/CallbackClientAuthenticatorTest.php index a604a21..9a642f5 100644 --- a/Tests/Security/CallbackClientAuthenticatorTest.php +++ b/Tests/Security/CallbackClientAuthenticatorTest.php @@ -28,8 +28,7 @@ class CallbackClientAuthenticatorTest extends TestCase ) ); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); + $auth = new CallbackClientAuthenticator($errorResponseFactory); $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); static::assertInstanceOf(JsonResponse::class, $result); @@ -40,8 +39,7 @@ class CallbackClientAuthenticatorTest extends TestCase { $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); + $auth = new CallbackClientAuthenticator($errorResponseFactory); $result = $auth->supports(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($result); @@ -67,7 +65,8 @@ class CallbackClientAuthenticatorTest extends TestCase ->willReturn($user) ; - $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); + $auth = new CallbackClientAuthenticator($errorResponseFactory); + $auth->setUserRepository($userRepository); $passport = $auth->authenticate(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); $authUser = $passport->getUser(); @@ -82,8 +81,7 @@ class CallbackClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $request = $this->createMock(Request::class); $token = $this->createMock(TokenInterface::class); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory, $userRepository); + $auth = new CallbackClientAuthenticator($errorResponseFactory); $result = $auth->onAuthenticationSuccess($request, $token, 'key'); diff --git a/Tests/Security/FrontApiClientAuthenticatorTest.php b/Tests/Security/FrontApiClientAuthenticatorTest.php index 219fb6a..58c420e 100644 --- a/Tests/Security/FrontApiClientAuthenticatorTest.php +++ b/Tests/Security/FrontApiClientAuthenticatorTest.php @@ -29,8 +29,7 @@ class FrontApiClientAuthenticatorTest extends TestCase ) ); $security = $this->createMock(Security::class); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); static::assertInstanceOf(JsonResponse::class, $result); @@ -42,8 +41,8 @@ class FrontApiClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(new User()); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->supports(new Request()); static::assertFalse($result); @@ -54,8 +53,7 @@ class FrontApiClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(null); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->supports(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($result); @@ -74,7 +72,8 @@ class FrontApiClientAuthenticatorTest extends TestCase ->with([FrontApiClientAuthenticator::AUTH_FIELD => '123']) ->willReturn($user) ; - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $auth->setUserRepository($userRepository); $passport = $auth->authenticate(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); $authUser = $passport->getUser(); @@ -90,8 +89,8 @@ class FrontApiClientAuthenticatorTest extends TestCase $security = $this->createMock(Security::class); $request = $this->createMock(Request::class); $token = $this->createMock(TokenInterface::class); - $userRepository = $this->createMock(ObjectRepository::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security, $userRepository); + + $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->onAuthenticationSuccess($request, $token, 'key'); From 180ccab466708865727a407c0fa529fa5a7bb488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Thu, 21 Jul 2022 13:02:32 +0300 Subject: [PATCH 10/13] Fix authenticators and dependecy injection --- .../RetailCrmServiceExtension.php | 4 +- Resources/doc/Security.md | 39 ++++++++----------- Security/AbstractClientAuthenticator.php | 7 ---- Security/CallbackClientAuthenticator.php | 3 +- Security/FrontApiClientAuthenticator.php | 3 +- Tests/DataFixtures/User.php | 4 +- .../CallbackClientAuthenticatorTest.php | 17 +++----- .../FrontApiClientAuthenticatorTest.php | 16 +++----- 8 files changed, 36 insertions(+), 57 deletions(-) diff --git a/DependencyInjection/RetailCrmServiceExtension.php b/DependencyInjection/RetailCrmServiceExtension.php index 10d7805..cb0c29f 100644 --- a/DependencyInjection/RetailCrmServiceExtension.php +++ b/DependencyInjection/RetailCrmServiceExtension.php @@ -66,8 +66,8 @@ class RetailCrmServiceExtension extends Extension $container ->register(CallbackValueResolver::class) ->setArguments([ - new Reference($container->getParameter('retail_crm_service.request_schema.callback.serializer')), new Reference('validator'), + new Reference($container->getParameter('retail_crm_service.request_schema.callback.serializer')), $container->getParameter('retail_crm_service.request_schema.callback.supports') ]) ->addTag('controller.argument_value_resolver', ['priority' => 50]) @@ -76,8 +76,8 @@ class RetailCrmServiceExtension extends Extension $container ->register(ClientValueResolver::class) ->setArguments([ - new Reference($container->getParameter('retail_crm_service.request_schema.client.serializer')), new Reference('validator'), + new Reference($container->getParameter('retail_crm_service.request_schema.client.serializer')), $container->getParameter('retail_crm_service.request_schema.client.supports') ]) ->addTag('controller.argument_value_resolver', ['priority' => 50]) diff --git a/Resources/doc/Security.md b/Resources/doc/Security.md index d42c32f..dbb9932 100644 --- a/Resources/doc/Security.md +++ b/Resources/doc/Security.md @@ -23,12 +23,13 @@ security: custom_authenticators: - RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator front: - pattern: ^/(front|login) + pattern: ^/auth provider: connection stateless: false remember_me: secret: '%kernel.secret%' lifetime: 604800 # 1 week in seconds + signature_properties: ['clientId'] always_remember_me: true custom_authenticators: - RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator @@ -41,33 +42,27 @@ security: - { path: ^/simple-connection, roles: PUBLIC_ACCESS } ``` -To authenticate the user after creating it, you can use the following code +Login controller will be called after the authenticator successfully authenticates the user. You can get the authenticated user, generate a token (or whatever you need to return) and return response: ```php - use App\Entity\Connection; - use App\Services\ConnectionManager; - use Symfony\Component\HttpFoundation\Request; - use Symfony\Component\Security\Http\Authentication\UserAuthenticatorInterface; - use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; + use App\Entity\User; + use Symfony\Component\Security\Http\Attribute\CurrentUser; - class AppController extends AbstractController + class ApiLoginController extends AbstractController { - public function someAction( - Request $request, - Connection $connection, - ConnectionManager $manager, - UserAuthenticatorInterface $userAuthenticator, - FrontApiClientAuthenticator $authenticator - ): Response { - $exist = $manager->search($connection); //get connection - - $userAuthenticator->authenticateUser( - $connection, - $authenticator, - $request - ); + #[Route('/auth', name: 'auth')] + public function auth(#[CurrentUser] ?User $user): Response + { + $token = ...; // somehow create an API token for $user + + return $this->json([ + 'user' => $user->getUserIdentifier(), + 'token' => $token, + ]); } } ``` + +The #[CurrentUser] can only be used in controller arguments to retrieve the authenticated user. In services, you would use getUser(). diff --git a/Security/AbstractClientAuthenticator.php b/Security/AbstractClientAuthenticator.php index f7a809b..55c3960 100644 --- a/Security/AbstractClientAuthenticator.php +++ b/Security/AbstractClientAuthenticator.php @@ -16,8 +16,6 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator { public const AUTH_FIELD = 'clientId'; - protected ObjectRepository $userRepository; - public function __construct(private ErrorJsonResponseFactory $errorResponseFactory) { } @@ -38,9 +36,4 @@ abstract class AbstractClientAuthenticator extends AbstractAuthenticator { return null; } - - public function setUserRepository(ObjectRepository $userRepository): void - { - $this->userRepository = $userRepository; - } } diff --git a/Security/CallbackClientAuthenticator.php b/Security/CallbackClientAuthenticator.php index eb3711f..452313c 100644 --- a/Security/CallbackClientAuthenticator.php +++ b/Security/CallbackClientAuthenticator.php @@ -24,8 +24,7 @@ class CallbackClientAuthenticator extends AbstractClientAuthenticator return new SelfValidatingPassport( new UserBadge( - $identifier, - fn ($userIdentifier) => $this->userRepository->findOneBy([static::AUTH_FIELD => $userIdentifier]) + $identifier ), [] ); diff --git a/Security/FrontApiClientAuthenticator.php b/Security/FrontApiClientAuthenticator.php index b92f3f9..d827f2c 100644 --- a/Security/FrontApiClientAuthenticator.php +++ b/Security/FrontApiClientAuthenticator.php @@ -38,8 +38,7 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator return new SelfValidatingPassport( new UserBadge( - $identifier, - fn ($userIdentifier) => $this->userRepository->findOneBy([static::AUTH_FIELD => $userIdentifier]), + $identifier ), [new RememberMeBadge()] ); diff --git a/Tests/DataFixtures/User.php b/Tests/DataFixtures/User.php index ad17192..47bd5fd 100644 --- a/Tests/DataFixtures/User.php +++ b/Tests/DataFixtures/User.php @@ -6,6 +6,8 @@ use Symfony\Component\Security\Core\User\UserInterface; class User implements UserInterface { + protected string $clientId = '123'; + public function getRoles(): array { return ["USER"]; @@ -22,6 +24,6 @@ class User implements UserInterface public function getUserIdentifier(): string { - return 'identifier'; + return $this->clientId; } } diff --git a/Tests/Security/CallbackClientAuthenticatorTest.php b/Tests/Security/CallbackClientAuthenticatorTest.php index 9a642f5..eff026b 100644 --- a/Tests/Security/CallbackClientAuthenticatorTest.php +++ b/Tests/Security/CallbackClientAuthenticatorTest.php @@ -12,6 +12,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; +use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; class CallbackClientAuthenticatorTest extends TestCase { @@ -58,19 +59,13 @@ class CallbackClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $user = new User(); - $userRepository = $this->createMock(ObjectRepository::class); - $userRepository - ->expects(static::once()) - ->method('findOneBy') - ->willReturn($user) - ; - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $auth->setUserRepository($userRepository); - $passport = $auth->authenticate(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); - $authUser = $passport->getUser(); - static::assertEquals($user, $authUser); + static::assertTrue($passport->hasBadge(UserBadge::class)); + static::assertEquals( + $user->getUserIdentifier(), + $passport->getBadge(UserBadge::class)->getUserIdentifier() + ); $this->expectException(AuthenticationException::class); $auth->authenticate(new Request()); diff --git a/Tests/Security/FrontApiClientAuthenticatorTest.php b/Tests/Security/FrontApiClientAuthenticatorTest.php index 58c420e..bfec186 100644 --- a/Tests/Security/FrontApiClientAuthenticatorTest.php +++ b/Tests/Security/FrontApiClientAuthenticatorTest.php @@ -13,6 +13,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; +use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; class FrontApiClientAuthenticatorTest extends TestCase { @@ -65,19 +66,14 @@ class FrontApiClientAuthenticatorTest extends TestCase $security = $this->createMock(Security::class); $user = new User(); - $userRepository = $this->createMock(ObjectRepository::class); - $userRepository - ->expects(static::once()) - ->method('findOneBy') - ->with([FrontApiClientAuthenticator::AUTH_FIELD => '123']) - ->willReturn($user) - ; $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $auth->setUserRepository($userRepository); $passport = $auth->authenticate(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); - $authUser = $passport->getUser(); - static::assertEquals($user, $authUser); + static::assertTrue($passport->hasBadge(UserBadge::class)); + static::assertEquals( + $user->getUserIdentifier(), + $passport->getBadge(UserBadge::class)->getUserIdentifier() + ); $this->expectException(AuthenticationException::class); $auth->authenticate(new Request()); From a61d276a83ce33175bb5f8346849d492ed972a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Thu, 21 Jul 2022 17:39:34 +0300 Subject: [PATCH 11/13] Update authenticator && documentation --- Resources/doc/Requests.md | 2 + Resources/doc/Security.md | 27 +++--- ...ticator.php => ApiClientAuthenticator.php} | 5 +- Security/CallbackClientAuthenticator.php | 32 ------- ...est.php => ApiClientAuthenticatorTest.php} | 19 ++--- .../CallbackClientAuthenticatorTest.php | 85 ------------------- 6 files changed, 23 insertions(+), 147 deletions(-) rename Security/{FrontApiClientAuthenticator.php => ApiClientAuthenticator.php} (87%) delete mode 100644 Security/CallbackClientAuthenticator.php rename Tests/Security/{FrontApiClientAuthenticatorTest.php => ApiClientAuthenticatorTest.php} (79%) delete mode 100644 Tests/Security/CallbackClientAuthenticatorTest.php diff --git a/Resources/doc/Requests.md b/Resources/doc/Requests.md index a70866d..9aa1e58 100644 --- a/Resources/doc/Requests.md +++ b/Resources/doc/Requests.md @@ -2,6 +2,8 @@ #### Callbacks (form data) +> For successful deserialization of an entity, there must be setters for the passed parameters + To automatically get the callback request parameter ```php diff --git a/Resources/doc/Security.md b/Resources/doc/Security.md index dbb9932..d0b63ce 100644 --- a/Resources/doc/Security.md +++ b/Resources/doc/Security.md @@ -16,21 +16,10 @@ security: pattern: ^/simple-connection stateless: true security: false - callback: - pattern: ^/callback + front: + pattern: ^/front provider: connection stateless: true - custom_authenticators: - - RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator - front: - pattern: ^/auth - provider: connection - stateless: false - remember_me: - secret: '%kernel.secret%' - lifetime: 604800 # 1 week in seconds - signature_properties: ['clientId'] - always_remember_me: true custom_authenticators: - RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator main: @@ -38,8 +27,8 @@ security: lazy: true access_control: - - { path: ^/front, roles: IS_AUTHENTICATED_REMEMBERED } - - { path: ^/simple-connection, roles: PUBLIC_ACCESS } + - { path: ^/front, roles: IS_AUTHENTICATED_FULLY } + - { path: ^/(simple-connection), roles: PUBLIC_ACCESS } ``` Login controller will be called after the authenticator successfully authenticates the user. You can get the authenticated user, generate a token (or whatever you need to return) and return response: @@ -51,8 +40,8 @@ Login controller will be called after the authenticator successfully authenticat class ApiLoginController extends AbstractController { - #[Route('/auth', name: 'auth')] - public function auth(#[CurrentUser] ?User $user): Response + #[Route('/front', name: 'front')] + public function front(#[CurrentUser] ?User $user): Response { $token = ...; // somehow create an API token for $user @@ -66,3 +55,7 @@ Login controller will be called after the authenticator successfully authenticat ``` The #[CurrentUser] can only be used in controller arguments to retrieve the authenticated user. In services, you would use getUser(). + +See the [manual](https://symfony.com/doc/6.0/security.html) for more information. + +> If you set the parameter stateless: false, then during an active session the login will be made on the basis of the data deserialized from the session storage \ No newline at end of file diff --git a/Security/FrontApiClientAuthenticator.php b/Security/ApiClientAuthenticator.php similarity index 87% rename from Security/FrontApiClientAuthenticator.php rename to Security/ApiClientAuthenticator.php index d827f2c..af7dfc1 100644 --- a/Security/FrontApiClientAuthenticator.php +++ b/Security/ApiClientAuthenticator.php @@ -6,12 +6,11 @@ use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; -use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Passport; use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport; -class FrontApiClientAuthenticator extends AbstractClientAuthenticator +class ApiClientAuthenticator extends AbstractClientAuthenticator { public function __construct( ErrorJsonResponseFactory $errorResponseFactory, @@ -40,7 +39,7 @@ class FrontApiClientAuthenticator extends AbstractClientAuthenticator new UserBadge( $identifier ), - [new RememberMeBadge()] + [] ); } } diff --git a/Security/CallbackClientAuthenticator.php b/Security/CallbackClientAuthenticator.php deleted file mode 100644 index 452313c..0000000 --- a/Security/CallbackClientAuthenticator.php +++ /dev/null @@ -1,32 +0,0 @@ -request->has(static::AUTH_FIELD) || $request->query->has(static::AUTH_FIELD); - } - - public function authenticate(Request $request): Passport - { - $identifier = $request->request->get(static::AUTH_FIELD); - if (null === $identifier) { - throw new AuthenticationException('Request does not contain authentication data'); - } - - return new SelfValidatingPassport( - new UserBadge( - $identifier - ), - [] - ); - } -} diff --git a/Tests/Security/FrontApiClientAuthenticatorTest.php b/Tests/Security/ApiClientAuthenticatorTest.php similarity index 79% rename from Tests/Security/FrontApiClientAuthenticatorTest.php rename to Tests/Security/ApiClientAuthenticatorTest.php index bfec186..9cfc5eb 100644 --- a/Tests/Security/FrontApiClientAuthenticatorTest.php +++ b/Tests/Security/ApiClientAuthenticatorTest.php @@ -2,10 +2,9 @@ namespace RetailCrm\ServiceBundle\Tests\Security; -use Doctrine\Persistence\ObjectRepository; use PHPUnit\Framework\TestCase; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; -use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; +use RetailCrm\ServiceBundle\Security\ApiClientAuthenticator; use RetailCrm\ServiceBundle\Tests\DataFixtures\User; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -15,7 +14,7 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; -class FrontApiClientAuthenticatorTest extends TestCase +class ApiClientAuthenticatorTest extends TestCase { public function testOnAuthenticationFailure(): void { @@ -30,7 +29,7 @@ class FrontApiClientAuthenticatorTest extends TestCase ) ); $security = $this->createMock(Security::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $auth = new ApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); static::assertInstanceOf(JsonResponse::class, $result); @@ -43,7 +42,7 @@ class FrontApiClientAuthenticatorTest extends TestCase $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(new User()); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $auth = new ApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->supports(new Request()); static::assertFalse($result); @@ -54,8 +53,8 @@ class FrontApiClientAuthenticatorTest extends TestCase $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); $security = $this->createMock(Security::class); $security->method('getUser')->willReturn(null); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); - $result = $auth->supports(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); + $auth = new ApiClientAuthenticator($errorResponseFactory, $security); + $result = $auth->supports(new Request([], [ApiClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($result); } @@ -66,9 +65,9 @@ class FrontApiClientAuthenticatorTest extends TestCase $security = $this->createMock(Security::class); $user = new User(); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $auth = new ApiClientAuthenticator($errorResponseFactory, $security); - $passport = $auth->authenticate(new Request([], [FrontApiClientAuthenticator::AUTH_FIELD => '123'])); + $passport = $auth->authenticate(new Request([], [ApiClientAuthenticator::AUTH_FIELD => '123'])); static::assertTrue($passport->hasBadge(UserBadge::class)); static::assertEquals( $user->getUserIdentifier(), @@ -86,7 +85,7 @@ class FrontApiClientAuthenticatorTest extends TestCase $request = $this->createMock(Request::class); $token = $this->createMock(TokenInterface::class); - $auth = new FrontApiClientAuthenticator($errorResponseFactory, $security); + $auth = new ApiClientAuthenticator($errorResponseFactory, $security); $result = $auth->onAuthenticationSuccess($request, $token, 'key'); diff --git a/Tests/Security/CallbackClientAuthenticatorTest.php b/Tests/Security/CallbackClientAuthenticatorTest.php deleted file mode 100644 index eff026b..0000000 --- a/Tests/Security/CallbackClientAuthenticatorTest.php +++ /dev/null @@ -1,85 +0,0 @@ -createMock(ErrorJsonResponseFactory::class); - $errorResponseFactory - ->expects(static::once()) - ->method('create') - ->willReturn( - new JsonResponse( - ['message' => 'An authentication exception occurred.'], - Response::HTTP_FORBIDDEN - ) - ); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->onAuthenticationFailure(new Request(), new AuthenticationException()); - - static::assertInstanceOf(JsonResponse::class, $result); - static::assertEquals(Response::HTTP_FORBIDDEN, $result->getStatusCode()); - } - - public function testSupports(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $result = $auth->supports(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertTrue($result); - - $result = $auth->supports(new Request([CallbackClientAuthenticator::AUTH_FIELD => '123'])); - - static::assertTrue($result); - - $result = $auth->supports(new Request()); - - static::assertFalse($result); - } - - public function testAuthenticate(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $user = new User(); - - $auth = new CallbackClientAuthenticator($errorResponseFactory); - $passport = $auth->authenticate(new Request([], [CallbackClientAuthenticator::AUTH_FIELD => '123'])); - static::assertTrue($passport->hasBadge(UserBadge::class)); - static::assertEquals( - $user->getUserIdentifier(), - $passport->getBadge(UserBadge::class)->getUserIdentifier() - ); - - $this->expectException(AuthenticationException::class); - $auth->authenticate(new Request()); - } - - public function testOnAuthenticationSuccess(): void - { - $errorResponseFactory = $this->createMock(ErrorJsonResponseFactory::class); - $request = $this->createMock(Request::class); - $token = $this->createMock(TokenInterface::class); - $auth = new CallbackClientAuthenticator($errorResponseFactory); - - $result = $auth->onAuthenticationSuccess($request, $token, 'key'); - - static::assertNull($result); - } -} From 4b37b0c17c4a6c6fdcdde73cd5ff072b5af5a8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Thu, 21 Jul 2022 17:44:16 +0300 Subject: [PATCH 12/13] Update dependency injection --- DependencyInjection/RetailCrmServiceExtension.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/DependencyInjection/RetailCrmServiceExtension.php b/DependencyInjection/RetailCrmServiceExtension.php index cb0c29f..e5776d4 100644 --- a/DependencyInjection/RetailCrmServiceExtension.php +++ b/DependencyInjection/RetailCrmServiceExtension.php @@ -6,8 +6,7 @@ use RetailCrm\ServiceBundle\ArgumentResolver\CallbackValueResolver; use RetailCrm\ServiceBundle\ArgumentResolver\ClientValueResolver; use RetailCrm\ServiceBundle\Messenger\MessageHandler; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; -use RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator; -use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; +use RetailCrm\ServiceBundle\Security\ApiClientAuthenticator; use RetailCrm\ServiceBundle\Serializer\JMSSerializerAdapter; use RetailCrm\ServiceBundle\Serializer\SymfonySerializerAdapter; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -88,11 +87,7 @@ class RetailCrmServiceExtension extends Extension ->setAutowired(true); $container - ->register(CallbackClientAuthenticator::class) - ->setAutowired(true); - - $container - ->register(FrontApiClientAuthenticator::class) + ->register(ApiClientAuthenticator::class) ->setAutowired(true); $container From 488f960bcc2696b43ba2e14b596c927ad1453178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D0=B2=D0=B8=D1=87=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Thu, 21 Jul 2022 17:45:36 +0300 Subject: [PATCH 13/13] Fix test --- Tests/DependencyInjection/RetailCrmServiceExtensionTest.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php b/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php index 7c2ebaf..8f12ae0 100644 --- a/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php +++ b/Tests/DependencyInjection/RetailCrmServiceExtensionTest.php @@ -7,8 +7,7 @@ use RetailCrm\ServiceBundle\ArgumentResolver\CallbackValueResolver; use RetailCrm\ServiceBundle\ArgumentResolver\ClientValueResolver; use RetailCrm\ServiceBundle\DependencyInjection\RetailCrmServiceExtension; use RetailCrm\ServiceBundle\Response\ErrorJsonResponseFactory; -use RetailCrm\ServiceBundle\Security\CallbackClientAuthenticator; -use RetailCrm\ServiceBundle\Security\FrontApiClientAuthenticator; +use RetailCrm\ServiceBundle\Security\ApiClientAuthenticator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag; @@ -52,7 +51,6 @@ class RetailCrmServiceExtensionTest extends TestCase static::assertTrue($this->container->hasDefinition(CallbackValueResolver::class)); static::assertTrue($this->container->hasDefinition(ClientValueResolver::class)); static::assertTrue($this->container->hasDefinition(ErrorJsonResponseFactory::class)); - static::assertTrue($this->container->hasDefinition(CallbackClientAuthenticator::class)); - static::assertTrue($this->container->hasDefinition(FrontApiClientAuthenticator::class)); + static::assertTrue($this->container->hasDefinition(ApiClientAuthenticator::class)); } }