issue/26384 Fix store switcher when using different base url on stores #26548

TobiasLufinity · 2020-01-27T10:36:00Z

Description (*)

When a user switches between stores using the store switcher the request fails if the target store has a different base url than the current. This pull request changes the redirect controller to make the switch request using the targeted store' url instead so the switch is successful.

Fixed Issues (if relevant)

Fixes Store switcher redirects to homepage for multistore setup with different domains #26384 : Store switcher redirects to homepage for multistore setup with different domains
Fixes Store view switcher is wrong , when each store views have different url. #23755 : Store view switcher is wrong , when each store views have different url.

Manual testing scenarios (*)

Have simple Magento 2.4-dev setup with sampledata
Create two or more stores with different base url (i.e default.magento.dev and en.magento.dev)
Go to a category page of one store
Switch between the stores using the store switcher

Result without fix: You end up on the start page, without switched store and not the category on which you were on.
Result with fix: Store is switched and you stay in the same page you were on

Questions or comments

No automated tests has been created for this pull request

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

m2-assistant · 2020-01-27T10:36:03Z

Hi @TobiasCodeNull. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Guide documentation.

edenduong

Thank you for your contribution. Please see my comment. And could you please cover your change by Automation Test? Thank you !

edenduong · 2020-01-31T00:25:31Z

app/code/Magento/Store/Controller/Store/Redirect.php

@@ -53,12 +60,14 @@ public function __construct(
        StoreResolverInterface $storeResolver,
        \Magento\Framework\Session\Generic $session,
        \Magento\Framework\Session\SidResolverInterface $sidResolver,
-        HashGenerator $hashGenerator
+        HashGenerator $hashGenerator,
+        StoreManagerInterface $storeManager


Please change it to StoreManagerInterface $storeManager = null for backward compatible
https://devdocs.magento.com/guides/v2.3/contributor-guide/backward-compatible-development/

edenduong · 2020-01-31T00:27:21Z

app/code/Magento/Store/Controller/Store/Redirect.php

    ) {
        parent::__construct($context);
        $this->storeRepository = $storeRepository;
        $this->storeResolver = $storeResolver;
        $this->hashGenerator = $hashGenerator;
+        $this->storeManager = $storeManager;


Please change to$this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class); for backward compatible
https://devdocs.magento.com/guides/v2.3/contributor-guide/backward-compatible-development/

TobiasLufinity · 2020-01-31T17:23:44Z

Simple test made which goes through the controller and make sure that the StoreManager change to the correct store.
Also added the backwards compatibility for the controller.

edenduong

Hi. Please add use ... to your code and add some const. Thanks.

edenduong · 2020-02-03T00:40:26Z

app/code/Magento/Store/Test/Unit/Controller/Store/RedirectTest.php

+     */
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)->getMock();


Please use Magento\Store\Model\StoreManagerInterface; in all similar class and use the Alias.

edenduong · 2020-02-03T00:41:37Z

app/code/Magento/Store/Test/Unit/Controller/Store/RedirectTest.php

+     */
+    public function testExecute()
+    {
+        $storeToSwitchToCode = 'sv2';


Please add the const const STUB_STORE_TO_SWITCH_TO_CODE = 'sv2'; and const STUB_DEFAULT_STORE_VIEW = 'default';

app/code/Magento/Store/Test/Unit/Controller/Store/RedirectTest.php

TobiasLufinity · 2020-02-03T08:21:48Z

Cleaned up code and added Const values.

… issue/26384

edenduong · 2020-02-11T08:39:36Z

Cleaned up code and added Const values.

Hi @TobiasCodeNull. Please resolve the confict code. And please use the alias in the DocBlock also.

engcom-Charlie · 2020-02-11T08:55:18Z

Hi, @edenduong I'll take care of this.

# Conflicts: # app/code/Magento/Store/Test/Unit/Controller/Store/RedirectTest.php

…k\MockObject\MockObject in DocBlocks

…26384

TobiasLufinity · 2020-02-11T09:43:17Z

I'll leave this to @engcom-Charlie then

magento-engcom-team · 2020-02-12T09:22:41Z

Hi @edenduong, thank you for the review.
ENGCOM-6869 has been created to process this Pull Request

magento-engcom-team · 2020-02-12T09:22:43Z

@TobiasCodeNull thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

engcom-Delta · 2020-02-27T09:13:28Z

✔️ QA passed

… url on stores #26548

m2-assistant · 2020-02-28T22:04:19Z

Hi @TobiasCodeNull, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

viktym · 2020-09-22T22:42:55Z

For Magento versions 2.3.0 - 2.3.5 patch is available in Magento Quality Patches package (MQP)

MQP Installation
$ composer require magento/quality-patches

Applying a Patch
$ ./vendor/bin/magento-patches apply MDVA-30107

Patch Details
https://support.magento.com/hc/en-us/articles/360049869051

issue/26384 Fix store switcher when using different base url on stores

346e544

TobiasLufinity requested a review from akaplya as a code owner January 27, 2020 10:36

edenduong self-assigned this Jan 31, 2020

edenduong added Component: Store Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests labels Jan 31, 2020

edenduong requested changes Jan 31, 2020

View reviewed changes

ghost added the Progress: needs update label Jan 31, 2020

Added Test and backwards compatibility

392bd3b

edenduong requested changes Feb 3, 2020

View reviewed changes

Added Const variables and cleanup code

0cbc5b6

engcom-Charlie assigned engcom-Charlie and unassigned engcom-Charlie Feb 3, 2020

TobiasLufinity and others added 3 commits February 6, 2020 09:51

Merge branch '2.4-develop' into issue/26384

420fa1c

Fixed Coding standard issues

1375b53

Merge branch 'issue/26384' of github.com:TobiasCodeNull/magento2 into…

9cad4dc

… issue/26384

engcom-Charlie self-assigned this Feb 11, 2020

engcom-Foxtrot requested a review from edenduong February 11, 2020 08:23

engcom-Charlie and others added 5 commits February 11, 2020 11:02

Merge branch '2.4-develop' into issue/26384

6024195

# Conflicts: # app/code/Magento/Store/Test/Unit/Controller/Store/RedirectTest.php

Removed full paths from DocBlock

ee97fb5

Chacnged PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framewor…

689093a

…k\MockObject\MockObject in DocBlocks

Merge branch '2.4-develop' into issue/26384

4708394

Merge remote-tracking branch 'TobiasCodeNull/issue/26384' into issue/…

597bb18

…26384

fix static, add unit test

0fcb6a0

engcom-Charlie added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Feb 11, 2020

engcom-Charlie removed the Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests label Feb 11, 2020

edenduong approved these changes Feb 12, 2020

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Feb 12, 2020

magento-engcom-team added the Release Line: 2.4 label Feb 12, 2020

engcom-Delta self-assigned this Feb 19, 2020

ghost added Progress: testing in progress Progress: extended testing and removed Progress: ready for testing Progress: testing in progress Progress: extended testing labels Feb 19, 2020

ghost added Progress: extended testing Progress: accept and removed Progress: testing in progress Progress: extended testing labels Feb 27, 2020

magento-engcom-team added the Award: bug fix label Feb 27, 2020

This was referenced Feb 28, 2020

Store view switcher is wrong , when each store views have different url. #23755

Closed

Store switcher redirects to homepage for multistore setup with different domains #26384

Closed

magento-engcom-team pushed a commit that referenced this pull request Feb 28, 2020

ENGCOM-6869: issue/26384 Fix store switcher when using different base…

a998b2f

… url on stores #26548

magento-engcom-team merged commit 0213f14 into magento:2.4-develop Feb 28, 2020

ihor-sviziev mentioned this pull request Aug 18, 2020

Magento Store Switch - 2 store views, 2 domains. "The store that was requested wasn't found. Verify the store and try again." #27540

Closed

sdzhepa mentioned this pull request May 9, 2022

tyutyu sdzhepa/magento2#5

Open

issue/26384 Fix store switcher when using different base url on stores #26548

issue/26384 Fix store switcher when using different base url on stores #26548

Uh oh!

Conversation

TobiasLufinity commented Jan 27, 2020 • edited by ihor-sviziev Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Jan 27, 2020

Uh oh!

edenduong left a comment

Choose a reason for hiding this comment

Uh oh!

edenduong Jan 31, 2020

Choose a reason for hiding this comment

Uh oh!

edenduong Jan 31, 2020

Choose a reason for hiding this comment

Uh oh!

TobiasLufinity commented Jan 31, 2020

Uh oh!

edenduong left a comment

Choose a reason for hiding this comment

Uh oh!

edenduong Feb 3, 2020

Choose a reason for hiding this comment

Uh oh!

edenduong Feb 3, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TobiasLufinity commented Feb 3, 2020

Uh oh!

edenduong commented Feb 11, 2020

Uh oh!

engcom-Charlie commented Feb 11, 2020

Uh oh!

TobiasLufinity commented Feb 11, 2020

Uh oh!

magento-engcom-team commented Feb 12, 2020

Uh oh!

magento-engcom-team commented Feb 12, 2020

Uh oh!

engcom-Delta commented Feb 27, 2020

Uh oh!

m2-assistant bot commented Feb 28, 2020

Uh oh!

viktym commented Sep 22, 2020

Uh oh!

Uh oh!

TobiasLufinity commented Jan 27, 2020 •

edited by ihor-sviziev

Loading