MAGETWO-45453: Product API does not work properly for non-default store code

Michail Slabko · Michail Slabko · commit c64f6d365341 · 2015-11-13T20:18:32.000+02:00
- fix SOAP issue with "all" store code
diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php
@@ -53,8 +53,7 @@ public function process($pathInfo)
         if (isset($stores[$storeCode])) {
             $this->storeManager->setCurrentStore($storeCode);
             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
-        } else if ($storeCode === self::ALL_STORE_CODE || $storeCode === \Magento\Store\Model\Store::ADMIN_CODE) {
-            //TODO: eliminate "admin" check after MAGETWO-45544
+        } else if ($storeCode === self::ALL_STORE_CODE) {
             $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE);
             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
         } else {
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -148,9 +148,12 @@ public function generateUri($isWsdl = false)
      */
     public function getEndpointUri()
     {
+        $storeCode = $this->_storeManager->getStore()->getCode() === \Magento\Store\Model\Store::ADMIN_CODE
+            ? \Magento\Webapi\Controller\PathProcessor::ALL_STORE_CODE
+            : $this->_storeManager->getStore()->getCode();
         return $this->_storeManager->getStore()->getBaseUrl()
             . $this->_areaList->getFrontName($this->_configScope->getCurrentScope())
-            . '/' . $this->_storeManager->getStore()->getCode();
+            . '/' . $storeCode;
     }
 
     /**
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -127,8 +127,6 @@ public function generateWsdlUrl($services, $storeCode = null)
                 ->get('Magento\Store\Model\StoreManagerInterface')
                 ->getStore()
                 ->getCode();
-        } elseif ($storeCode === \Magento\Webapi\Controller\PathProcessor::ALL_STORE_CODE) {
-            $storeCode = \Magento\Store\Model\Store::ADMIN_CODE;
         }
 
         /** TESTS_BASE_URL is initialized in PHPUnit configuration */

Original file line number	Diff line number	Diff line change
`@@ -148,9 +148,12 @@ public function generateUri($isWsdl = false)`
`148`	`148`	`*/`
`149`	`149`	`public function getEndpointUri()`
`150`	`150`	`{`
	`151`	`+ $storeCode = $this->_storeManager->getStore()->getCode() === \Magento\Store\Model\Store::ADMIN_CODE`
	`152`	`+ ? \Magento\Webapi\Controller\PathProcessor::ALL_STORE_CODE`
	`153`	`+ : $this->_storeManager->getStore()->getCode();`
`151`	`154`	`return $this->_storeManager->getStore()->getBaseUrl()`
`152`	`155`	`. $this->_areaList->getFrontName($this->_configScope->getCurrentScope())`
`153`		`- . '/' . $this->_storeManager->getStore()->getCode();`
	`156`	`+ . '/' . $storeCode;`
`154`	`157`	`}`
`155`	`158`
`156`	`159`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,6 @@ public function generateWsdlUrl($services, $storeCode = null)`
`127`	`127`	`->get('Magento\Store\Model\StoreManagerInterface')`
`128`	`128`	`->getStore()`
`129`	`129`	`->getCode();`
`130`		`- } elseif ($storeCode === \Magento\Webapi\Controller\PathProcessor::ALL_STORE_CODE) {`
`131`		`- $storeCode = \Magento\Store\Model\Store::ADMIN_CODE;`
`132`	`130`	`}`
`133`	`131`
`134`	`132`	`/** TESTS_BASE_URL is initialized in PHPUnit configuration */`