-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[API] Fix cart blaming #12512
Merged
Merged
[API] Fix cart blaming #12512
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6a525e7
Remove listening for JWT event in CartBlamerListener and use section …
GSadee 87e13c5
[API] Overwrite CartBlamerListener in ApiBundle
GSadee 34c8357
add new Section class and fix cart blaming
arti0090 7aaf9d3
move cartBlamerListener to proper bundle
arti0090 9fd8d13
fix and rename listeners
arti0090 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
src/Sylius/Bundle/ApiBundle/EventListener/ApiCartBlamerListener.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Paweł Jędrzejewski | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\ApiBundle\EventListener; | ||
|
||
use Sylius\Bundle\ApiBundle\SectionResolver\ShopApiOrdersSubSection; | ||
use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface; | ||
use Sylius\Bundle\UserBundle\Event\UserEvent; | ||
use Sylius\Component\Core\Model\OrderInterface; | ||
use Sylius\Component\Core\Model\ShopUserInterface; | ||
use Sylius\Component\Order\Context\CartContextInterface; | ||
use Sylius\Component\Order\Context\CartNotFoundException; | ||
use Sylius\Component\Resource\Exception\UnexpectedTypeException; | ||
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; | ||
|
||
final class ApiCartBlamerListener | ||
{ | ||
/** @var CartContextInterface */ | ||
private $cartContext; | ||
|
||
/** @var SectionProviderInterface */ | ||
private $uriBasedSectionContext; | ||
|
||
public function __construct( | ||
CartContextInterface $cartContext, | ||
SectionProviderInterface $uriBasedSectionContext | ||
) { | ||
$this->cartContext = $cartContext; | ||
$this->uriBasedSectionContext = $uriBasedSectionContext; | ||
} | ||
|
||
public function onImplicitLogin(UserEvent $userEvent): void | ||
{ | ||
if (!$this->uriBasedSectionContext->getSection() instanceof ShopApiOrdersSubSection) { | ||
return; | ||
} | ||
|
||
$user = $userEvent->getUser(); | ||
if (!$user instanceof ShopUserInterface) { | ||
return; | ||
} | ||
|
||
$this->blame($user); | ||
} | ||
|
||
public function onInteractiveLogin(InteractiveLoginEvent $interactiveLoginEvent): void | ||
{ | ||
if (!$this->uriBasedSectionContext->getSection() instanceof ShopApiOrdersSubSection) { | ||
return; | ||
} | ||
|
||
$user = $interactiveLoginEvent->getAuthenticationToken()->getUser(); | ||
if (!$user instanceof ShopUserInterface) { | ||
return; | ||
} | ||
|
||
$this->blame($user); | ||
} | ||
|
||
private function blame(ShopUserInterface $user): void | ||
{ | ||
$cart = $this->getCart(); | ||
if (null === $cart || null !== $cart->getCustomer()) { | ||
return; | ||
} | ||
|
||
$cart->setCustomer($user->getCustomer()); | ||
} | ||
|
||
/** | ||
* @throws UnexpectedTypeException | ||
*/ | ||
private function getCart(): ?OrderInterface | ||
{ | ||
try { | ||
$cart = $this->cartContext->getCart(); | ||
} catch (CartNotFoundException $exception) { | ||
return null; | ||
} | ||
|
||
if (!$cart instanceof OrderInterface) { | ||
throw new UnexpectedTypeException($cart, OrderInterface::class); | ||
} | ||
|
||
return $cart; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Sylius/Bundle/ApiBundle/SectionResolver/ShopApiOrdersSubSection.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Paweł Jędrzejewski | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\ApiBundle\SectionResolver; | ||
|
||
class ShopApiOrdersSubSection extends ShopApiSection | ||
{ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you check if both cases are needed in Api?