MAGETWO-88217: Guest users unable to sign up to newsletters between stores

Author: olysenko

app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

@@ -125,8 +125,10 @@ public function execute()
                 $this->validateEmailAvailable($email);
 
                 $subscriber = $this->_subscriberFactory->create()->loadByEmail($email);
+                $storeId = $this->_storeManager->getStore()->getId();
                 if ($subscriber->getId()
                     && $subscriber->getSubscriberStatus() == \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED
+                    && $subscriber->getStoreId() === $storeId
                 ) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __('This email address is already subscribed.')

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -11,6 +11,8 @@
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Subscriber model
@@ -129,6 +131,16 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      */
     protected $inlineTranslation;
 
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
     /**
      * Initialize dependencies.
      *
@@ -146,6 +158,8 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param DateTime|null $dateTime
+     * @param CustomerInterfaceFactory|null $customerFactory
+     * @param DataObjectHelper|null $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -162,7 +176,9 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        DateTime $dateTime = null
+        DateTime $dateTime = null,
+        CustomerInterfaceFactory $customerFactory = null,
+        DataObjectHelper $dataObjectHelper = null
     ) {
         $this->_newsletterData = $newsletterData;
         $this->_scopeConfig = $scopeConfig;
@@ -173,6 +189,8 @@ public function __construct(
         $this->customerAccountManagement = $customerAccountManagement;
         $this->inlineTranslation = $inlineTranslation;
         $this->dateTime = $dateTime ?: ObjectManager::getInstance()->get(DateTime::class);
+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()->get(CustomerInterfaceFactory::class);
+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()->get(DataObjectHelper::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -405,7 +423,17 @@ public function randomSequence($length = 32)
      */
     public function subscribe($email)
     {
-        $this->loadByEmail($email);
+        $storeId = $this->_storeManager->getStore()->getId();
+        $customerData = ['store_id' => $storeId, 'email'=> $email];
+
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->getResource()->loadByCustomerData($customer);
 
         if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
             return $this->getStatus();