Merge branch 'ACP2E-91' of https://github.com/magento-l3/magento2ce into PR-2-2021-25-11

Author: chittima

app/code/Magento/Webapi/Model/Plugin/Store/Model/Validation/StoreCodeValidator.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Webapi\Model\Plugin\Store\Model\Validation;
+
+use Magento\Store\Model\Validation\StoreCodeValidator as Subject;
+
+/**
+ * Suppress using code parsed from url first path for api calls.
+ */
+class StoreCodeValidator
+{
+    /**
+     * Validate if store code parsed incorrectly.
+     *
+     * @param Subject $subject
+     * @param bool $result
+     * @param string $value
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterIsValid(Subject $subject, bool $result, string $value): bool
+    {
+        return false;
+    }
+}

app/code/Magento/Webapi/Test/Unit/Model/Plugin/Store/Model/Validation/StoreCodeValidatorTest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Webapi\Test\Unit\Model\Plugin\Store\Model\Validation;
+
+use Magento\Store\Model\Validation\StoreCodeValidator as Subject;
+use Magento\Webapi\Model\Plugin\Store\Model\Validation\StoreCodeValidator;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class StoreCodeValidatorTest extends TestCase
+{
+    /**
+     * @var Subject|MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->subjectMock = $this->getMockBuilder(Subject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterIsValidStore(): void
+    {
+        $storeCodeValidator = new StoreCodeValidator();
+        $this->assertFalse($storeCodeValidator->afterIsValid($this->subjectMock, true, 'rest'));
+    }
+}

app/code/Magento/Webapi/etc/webapi_rest/di.xml

@@ -80,4 +80,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\Validation\StoreCodeValidator">
+        <plugin name="check_if_parsed_store_code_is_valid" type="Magento\Webapi\Model\Plugin\Store\Model\Validation\StoreCodeValidator"/>
+    </type>
 </config>

app/code/Magento/Webapi/etc/webapi_soap/di.xml

@@ -63,5 +63,7 @@
         </arguments>
     </type>
     <!-- End of configuration to check that permissions are checked on fields -->
-
+    <type name="Magento\Store\Model\Validation\StoreCodeValidator">
+        <plugin name="check_if_parsed_store_code_is_valid" type="Magento\Webapi\Model\Plugin\Store\Model\Validation\StoreCodeValidator"/>
+    </type>
 </config>