Merge pull request #80 from BitBagCommerce/release/20230602

Release 20230602
BitBagCommerce · Jun 6, 2023 · 8bfa0b3 · 8bfa0b3
2 parents 6ceac78 + aa61b42
commit 8bfa0b3
Show file tree

Hide file tree

Showing 33 changed files with 503 additions and 142 deletions.
diff --git a/doc/installation.md b/doc/installation.md
@@ -62,7 +62,6 @@
    
     ```yml
     bitbag_sylius_vue_storefront2:
-        refresh_token_lifespan: 2592000 #that its default value
         test_endpoint: 'http://127.0.0.1:8080/api/v2/graphql' #that its default value
     ```
 ![Step6](/doc/images/Step6.png)
@@ -176,15 +175,25 @@ security:
 
 ![Step11](/doc/images/Step11.png)
     
-4Add redirection to your `.env` file:
+14. Add redirection to your `.env` file:
 
 ```env
 VSF2_HOST= #your VueStoreFront url address
 ```
 
 ![Step12](/doc/images/Step12.png)
+
+
+15. Add JWT token and refresh token TTL's to your `.env` file:
+
+```env
+APP_TOKEN_TTL=3600
+APP_REFRESH_TOKEN_TTL="+1 week"
+APP_REFRESH_TOKEN_EXTENDED_TTL="+3 month"
+```
+
      
-14. After all steps, run this commends in your project directory:
+16. After all steps, run this commends in your project directory:
 
 ```bash
 yarn install

diff --git a/spec/DataProvider/TaxonCollectionDataProviderSpec.php b/spec/DataProvider/TaxonCollectionDataProviderSpec.php
diff --git a/spec/Factory/ShopUserTokenFactorySpec.php b/spec/Factory/ShopUserTokenFactorySpec.php
@@ -11,9 +11,9 @@
 namespace spec\BitBag\SyliusVueStorefront2Plugin\Factory;
 
 use BitBag\SyliusVueStorefront2Plugin\Factory\ShopUserTokenFactory;
+use BitBag\SyliusVueStorefront2Plugin\Model\RefreshTokenInterface;
 use BitBag\SyliusVueStorefront2Plugin\Model\ShopUserToken;
 use Doctrine\ORM\EntityManagerInterface;
-use Gesdinet\JWTRefreshTokenBundle\Model\RefreshTokenInterface;
 use Gesdinet\JWTRefreshTokenBundle\Model\RefreshTokenManagerInterface;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface;
 use PhpSpec\ObjectBehavior;
@@ -27,7 +27,7 @@ public function let(
         JWTTokenManagerInterface $jwtManager,
         RefreshTokenManagerInterface $refreshJwtManager,
     ): void {
-        $this->beConstructedWith($entityManager, $jwtManager, $refreshJwtManager);
+        $this->beConstructedWith($entityManager, $jwtManager, $refreshJwtManager, '+5 second', '+3 month');
     }
 
     public function it_is_initializable(): void
@@ -68,6 +68,7 @@ public function it_gets_refresh_token(
         $username = 'canonical';
         $user->getUsernameCanonical()->willReturn($username);
         $refreshToken->setUsername($username)->shouldBeCalled();
+        $refreshToken->setRememberMe(true)->shouldBeCalled();
 
         $refreshToken->setRefreshToken()->shouldBeCalled();
 
@@ -76,6 +77,6 @@ public function it_gets_refresh_token(
         $entityManager->persist($refreshToken)->shouldBeCalled();
         $entityManager->flush()->shouldBeCalled();
 
-        $this->getRefreshToken($user)->shouldReturn($refreshToken);
+        $this->getRefreshToken($user, true)->shouldReturn($refreshToken);
     }
 }
diff --git a/spec/Resolver/Mutation/LoginResolverSpec.php b/spec/Resolver/Mutation/LoginResolverSpec.php
@@ -11,10 +11,10 @@
 namespace spec\BitBag\SyliusVueStorefront2Plugin\Resolver\Mutation;
 
 use BitBag\SyliusVueStorefront2Plugin\Factory\ShopUserTokenFactoryInterface;
+use BitBag\SyliusVueStorefront2Plugin\Model\RefreshTokenInterface;
 use BitBag\SyliusVueStorefront2Plugin\Model\ShopUserTokenInterface;
 use BitBag\SyliusVueStorefront2Plugin\Resolver\Mutation\LoginResolver;
 use Doctrine\ORM\EntityManagerInterface;
-use Gesdinet\JWTRefreshTokenBundle\Model\RefreshTokenInterface;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
@@ -70,13 +70,15 @@ public function it_is_invokable(
                 'input' => [
                     'username' => 'username',
                     'password' => 'somepass',
+                    'rememberMe' => true,
                 ],
             ],
         ];
 
         $input = $context['args']['input'];
         $username = (string) $input['username'];
         $password = (string) $input['password'];
+        $rememberMe = (bool) $input['rememberMe'];
 
         $userRepository->findOneBy(['username' => $username])->willReturn($user);
         $encoderFactory->getEncoder($user)->willReturn($encoder);
@@ -93,7 +95,7 @@ public function it_is_invokable(
 
         $encoder->isPasswordValid($userPassword, $password, $userSalt)->shouldBeCalled()->willReturn(true);
 
-        $tokenFactory->getRefreshToken($user)->willReturn($refreshToken);
+        $tokenFactory->getRefreshToken($user, $rememberMe)->willReturn($refreshToken);
         $tokenFactory->create($user, $refreshToken)->willReturn($shopUserToken);
 
         $eventDispatcher->dispatch(Argument::any(), LoginResolver::EVENT_NAME)->shouldBeCalled();
@@ -223,13 +225,15 @@ public function it_doesnt_throw_exception_when_logging_in_unverified_user_but_ch
                 'input' => [
                     'username' => 'username',
                     'password' => 'somepass',
+                    'rememberMe' => true,
                 ],
             ],
         ];
 
         $input = $context['args']['input'];
         $username = (string) $input['username'];
         $password = (string) $input['password'];
+        $rememberMe = (bool) $input['rememberMe'];
 
         $userRepository->findOneBy(['username' => $username])->willReturn($user);
         $encoderFactory->getEncoder($user)->willReturn($encoder);
@@ -246,7 +250,7 @@ public function it_doesnt_throw_exception_when_logging_in_unverified_user_but_ch
 
         $encoder->isPasswordValid($userPassword, $password, $userSalt)->shouldBeCalled()->willReturn(true);
 
-        $tokenFactory->getRefreshToken($user)->willReturn($refreshToken);
+        $tokenFactory->getRefreshToken($user, $rememberMe)->willReturn($refreshToken);
         $tokenFactory->create($user, $refreshToken)->willReturn($shopUserToken);
 
         $eventDispatcher->dispatch(Argument::any(), LoginResolver::EVENT_NAME)->shouldBeCalled();

diff --git a/spec/Resolver/Mutation/RefreshTokenResolverSpec.php b/spec/Resolver/Mutation/RefreshTokenResolverSpec.php
@@ -11,12 +11,12 @@
 namespace spec\BitBag\SyliusVueStorefront2Plugin\Resolver\Mutation;
 
 use BitBag\SyliusVueStorefront2Plugin\Factory\ShopUserTokenFactoryInterface;
+use BitBag\SyliusVueStorefront2Plugin\Model\RefreshToken;
+use BitBag\SyliusVueStorefront2Plugin\Model\RefreshTokenInterface;
 use BitBag\SyliusVueStorefront2Plugin\Model\ShopUserTokenInterface;
 use BitBag\SyliusVueStorefront2Plugin\Resolver\Mutation\RefreshTokenResolver;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectRepository;
-use Gesdinet\JWTRefreshTokenBundle\Entity\RefreshToken;
-use Gesdinet\JWTRefreshTokenBundle\Model\RefreshTokenInterface;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Sylius\Component\Core\Model\ShopUserInterface;
@@ -34,13 +34,15 @@ public function let(
         EventDispatcherInterface $eventDispatcher,
     ): void {
         $entityManager->getRepository(RefreshToken::class)->willReturn($refreshTokenRepository);
-        $lifespan = '2592000';
+        $refreshTokenTTL = '+1 week';
+        $refreshTokenExtendedTTL = '+3 month';
         $this->beConstructedWith(
             $entityManager,
             $tokenFactory,
             $userRepository,
             $eventDispatcher,
-            $lifespan,
+            $refreshTokenTTL,
+            $refreshTokenExtendedTTL,
         );
     }
 

diff --git a/spec/Serializer/TaxonNormalizerSpec.php b/spec/Serializer/TaxonNormalizerSpec.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file was created by developers working at BitBag
+ * Do you need more information about us and what we do? Visit our https://bitbag.io website!
+ * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career
+*/
+
+declare(strict_types=1);
+
+namespace spec\BitBag\SyliusVueStorefront2Plugin\Serializer;
+
+use BitBag\SyliusVueStorefront2Plugin\Serializer\TaxonNormalizer;
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
+use Sylius\Component\Core\Model\Taxon;
+use Sylius\Component\Core\Model\TaxonInterface;
+use Sylius\Component\Taxonomy\Model\TaxonTranslationInterface;
+
+final class TaxonNormalizerSpec extends ObjectBehavior
+{
+    public function it_is_initializable(): void
+    {
+        $this->shouldHaveType(TaxonNormalizer::class);
+    }
+
+    public function it_normalizes_taxon(
+        TaxonInterface $taxon,
+        TaxonInterface $taxonParent,
+        TaxonTranslationInterface $translation,
+    ): void {
+        $id = 111;
+        $parentId = 100;
+        $name = 'Test taxon name';
+        $code = 'test_taxon_code';
+        $position = 1;
+        $slug = 'test_taxon_slug';
+        $description = 'Test taxon description';
+        $enabled = true;
+        $level = 1;
+
+        $context = [
+            ContextKeys::LOCALE_CODE => 'en_US',
+        ];
+
+        $locale = $context[ContextKeys::LOCALE_CODE];
+        $taxon->getTranslation($locale)->willReturn($translation);
+
+        $taxon->getId()->willReturn($id);
+        $translation->getName()->willReturn($name);
+        $taxon->getName()->willReturn($name);
+        $taxon->getCode()->willReturn($code);
+        $taxon->getPosition()->willReturn($position);
+        $translation->getSlug()->willReturn($slug);
+        $taxon->getSlug()->willReturn($slug);
+        $translation->getDescription()->willReturn($description);
+        $taxon->getDescription()->willReturn($description);
+        $taxon->getParent()->willReturn($taxonParent);
+        $taxon->isEnabled()->willReturn($enabled);
+        $taxon->getLevel()->willReturn($level);
+        $taxon->getTranslation()->willReturn($translation);
+        $taxonParent->getId()->willReturn($parentId);
+
+        $result = [
+            'id' => $id,
+            'name' => $name,
+            'code' => $code,
+            'position' => $position,
+            'slug' => $slug,
+            'description' => $description,
+            'parent' => [
+                'id' => $parentId,
+            ],
+            'enabled' => $enabled,
+            'level' => $level,
+        ];
+
+        $this->normalize($taxon, null, $context)->shouldReturn($result);
+    }
+
+    public function it_checks_if_it_supports_normalization(Taxon $taxon): void
+    {
+        $this->supportsNormalization($taxon)->shouldReturn(true);
+    }
+}
diff --git a/src/DataProvider/TaxonCollectionDataProvider.php b/src/DataProvider/TaxonCollectionDataProvider.php
@@ -66,13 +66,11 @@ public function getCollection(string $resourceClass, string $operationName = nul
         $channelMenuTaxon = $channelContext->getMenuTaxon();
 
         $user = $this->userContext->getUser();
-        if ($this->isUserAllowedToGetAllTaxa($user)) {
-            return $this->taxonRepository->findAll();
+        if ($this->hasAccessToAllTaxa($user)) {
+            $channelMenuTaxon = null;
         }
 
-        $queryBuilder = $this->taxonRepository->createChildrenByChannelMenuTaxonQueryBuilder(
-            $channelMenuTaxon,
-        );
+        $queryBuilder = $this->taxonRepository->createChildrenByParentQueryBuilder($channelMenuTaxon);
 
         /** @var QueryCollectionExtensionInterface $extension */
         foreach ($this->collectionExtensions as $extension) {
@@ -95,7 +93,7 @@ public function getCollection(string $resourceClass, string $operationName = nul
         );
     }
 
-    private function isUserAllowedToGetAllTaxa(?UserInterface $user): bool
+    private function hasAccessToAllTaxa(?UserInterface $user): bool
     {
         /** @psalm-suppress DeprecatedClass */
         return $user !== null && in_array('ROLE_API_ACCESS', $user->getRoles(), true);

diff --git a/src/DependencyInjection/BitBagSyliusVueStorefront2Extension.php b/src/DependencyInjection/BitBagSyliusVueStorefront2Extension.php
@@ -26,7 +26,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $loader->load('services.xml');
 
-        $container->setParameter('bitbag_sylius_vue_storefront2.refresh_token_lifespan', $config['refresh_token_lifespan']);
         $container->setParameter('bitbag_sylius_vue_storefront2.test_endpoint', $config['test_endpoint']);
     }
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -30,7 +30,6 @@ public function getConfigTreeBuilder(): TreeBuilder
         $rootNode
             ->addDefaultsIfNotSet()
             ->children()
-                ->integerNode('refresh_token_lifespan')->defaultValue(2592000)->end()
                 ->scalarNode('test_endpoint')->defaultValue('http://127.0.0.1:8080/api/v2/graphql')->cannotBeEmpty()->end()
             ->end()
             ->end()
-Original file line number
+Diff line change
@@ Expand Up @@
             $loader->load('services.xml');
-            $container->setParameter('bitbag_sylius_vue_storefront2.refresh_token_lifespan', $config['refresh_token_lifespan']);
             $container->setParameter('bitbag_sylius_vue_storefront2.test_endpoint', $config['test_endpoint']);
         }
@@ Expand Down @@