MAGETWO-91497: Product websites are not honored

Author: danielrenaud

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -334,9 +334,7 @@ protected function initializeProductData(array $productData, $createNew)
         unset($productData['media_gallery']);
         if ($createNew) {
             $product = $this->productFactory->create();
-            if ($this->storeManager->hasSingleStore()) {
-                $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsiteId()]);
-            }
+            $this->assignProductToWebsites($product);
         } else {
             unset($this->instances[$productData['sku']]);
             $product = $this->get($productData['sku']);
@@ -345,9 +343,6 @@ protected function initializeProductData(array $productData, $createNew)
         foreach ($productData as $key => $value) {
             $product->setData($key, $value);
         }
-        if ($createNew) {
-            $this->assignProductToWebsites($product);
-        }
 
         return $product;
     }
@@ -358,15 +353,10 @@ protected function initializeProductData(array $productData, $createNew)
      */
     private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)
     {
-        $websiteIds = array_unique(
-            array_merge(
-                $product->getWebsiteIds(),
-                [$this->storeManager->getStore()->getWebsiteId()]
-            )
-        );
-
         if ($this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
             $websiteIds = array_keys($this->storeManager->getWebsites());
+        } else {
+            $websiteIds = [$this->storeManager->getStore()->getWebsiteId()];
         }
 
         $product->setWebsiteIds($websiteIds);