-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1795 from magento-engcom/2.2-develop-prs
[EngCom] Public Pull Requests - 2.2-develop
- Loading branch information
Showing
19 changed files
with
624 additions
and
213 deletions.
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
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
53 changes: 53 additions & 0 deletions
53
app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.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,53 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Customer\Model\Plugin; | ||
|
|
||
| use Magento\Customer\Model\Session; | ||
| use Magento\Framework\Data\Form\FormKey as DataFormKey; | ||
| use Magento\PageCache\Observer\FlushFormKey; | ||
|
|
||
| class CustomerFlushFormKey | ||
| { | ||
| /** | ||
| * @var Session | ||
| */ | ||
| private $session; | ||
|
|
||
| /** | ||
| * @var DataFormKey | ||
| */ | ||
| private $dataFormKey; | ||
|
|
||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param Session $session | ||
| * @param DataFormKey $dataFormKey | ||
| */ | ||
| public function __construct(Session $session, DataFormKey $dataFormKey) | ||
| { | ||
| $this->session = $session; | ||
| $this->dataFormKey = $dataFormKey; | ||
| } | ||
|
|
||
| /** | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| * @param FlushFormKey $subject | ||
| * @param callable $proceed | ||
| * @param $args | ||
| */ | ||
| public function aroundExecute(FlushFormKey $subject, callable $proceed, ...$args) | ||
| { | ||
| $currentFormKey = $this->dataFormKey->getFormKey(); | ||
| $proceed(...$args); | ||
| $beforeParams = $this->session->getBeforeRequestParams(); | ||
| if ($beforeParams['form_key'] == $currentFormKey) { | ||
| $beforeParams['form_key'] = $this->dataFormKey->getFormKey(); | ||
| $this->session->setBeforeRequestParams($beforeParams); | ||
| } | ||
| } | ||
| } |
105 changes: 105 additions & 0 deletions
105
app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerFlushFormKeyTest.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,105 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Customer\Test\Unit\Model\Plugin; | ||
|
|
||
| use Magento\Customer\Model\Plugin\CustomerFlushFormKey; | ||
| use Magento\Customer\Model\Session; | ||
| use Magento\Framework\App\PageCache\FormKey as CookieFormKey; | ||
| use Magento\Framework\Data\Form\FormKey as DataFormKey; | ||
| use Magento\Framework\Event\Observer; | ||
| use Magento\PageCache\Observer\FlushFormKey; | ||
| use PHPUnit\Framework\TestCase; | ||
| use PHPUnit_Framework_MockObject_MockObject as MockObject; | ||
|
|
||
| class CustomerFlushFormKeyTest extends TestCase | ||
| { | ||
| /** | ||
| * @var CookieFormKey | MockObject | ||
| */ | ||
| private $cookieFormKey; | ||
|
|
||
| /** | ||
| * @var Session | MockObject | ||
| */ | ||
| private $customerSession; | ||
|
|
||
| /** | ||
| * @var DataFormKey | MockObject | ||
| */ | ||
| private $dataFormKey; | ||
|
|
||
| protected function setUp() | ||
| { | ||
|
|
||
| /** @var CookieFormKey | MockObject */ | ||
| $this->cookieFormKey = $this->getMockBuilder(CookieFormKey::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| /** @var DataFormKey | MockObject */ | ||
| $this->dataFormKey = $this->getMockBuilder(DataFormKey::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| /** @var Session | MockObject */ | ||
| $this->customerSession = $this->getMockBuilder(Session::class) | ||
| ->disableOriginalConstructor() | ||
| ->setMethods(['getBeforeRequestParams', 'setBeforeRequestParams']) | ||
| ->getMock(); | ||
| } | ||
|
|
||
| /** | ||
| * @dataProvider aroundFlushFormKeyProvider | ||
| * @param $beforeFormKey | ||
| * @param $currentFormKey | ||
| * @param $getFormKeyTimes | ||
| * @param $setBeforeParamsTimes | ||
| */ | ||
| public function testAroundFlushFormKey( | ||
| $beforeFormKey, | ||
| $currentFormKey, | ||
| $getFormKeyTimes, | ||
| $setBeforeParamsTimes | ||
| ) { | ||
| $observerDto = new Observer(); | ||
| $observer = new FlushFormKey($this->cookieFormKey, $this->dataFormKey); | ||
| $plugin = new CustomerFlushFormKey($this->customerSession, $this->dataFormKey); | ||
|
|
||
| $beforeParams['form_key'] = $beforeFormKey; | ||
|
|
||
| $this->dataFormKey->expects($this->exactly($getFormKeyTimes)) | ||
| ->method('getFormKey') | ||
| ->willReturn($currentFormKey); | ||
|
|
||
| $this->customerSession->expects($this->once()) | ||
| ->method('getBeforeRequestParams') | ||
| ->willReturn($beforeParams); | ||
|
|
||
| $this->customerSession->expects($this->exactly($setBeforeParamsTimes)) | ||
| ->method('setBeforeRequestParams') | ||
| ->with($beforeParams); | ||
|
|
||
| $proceed = function ($observerDto) use ($observer) { | ||
| return $observer->execute($observerDto); | ||
| }; | ||
|
|
||
| $plugin->aroundExecute($observer, $proceed, $observerDto); | ||
| } | ||
|
|
||
| /** | ||
| * Data provider for testAroundFlushFormKey | ||
| * | ||
| * @return array | ||
| */ | ||
| public function aroundFlushFormKeyProvider() | ||
| { | ||
| return [ | ||
| ['form_key_value', 'form_key_value', 2, 1], | ||
| ['form_old_key_value', 'form_key_value', 1, 0], | ||
| [null, 'form_key_value', 1, 0] | ||
| ]; | ||
| } | ||
| } |
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.