Merge branch 'ACP2E-35' of https://github.com/magento-l3/magento2ce into PR-2022-02-15-CE2

Author: vkolesny

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

@@ -7,6 +7,7 @@
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\App\Action\Context;
@@ -47,6 +48,11 @@ class NewAction extends SubscriberController implements HttpPostActionInterface
      */
     private $subscriptionManager;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * Initialize dependencies.
      *
@@ -57,7 +63,8 @@ class NewAction extends SubscriberController implements HttpPostActionInterface
      * @param CustomerUrl $customerUrl
      * @param CustomerAccountManagement $customerAccountManagement
      * @param SubscriptionManagerInterface $subscriptionManager
-     * @param EmailValidator $emailValidator
+     * @param EmailValidator|null $emailValidator
+     * @param CustomerRepositoryInterface|null $customerRepository
      */
     public function __construct(
         Context $context,
@@ -67,11 +74,14 @@ public function __construct(
         CustomerUrl $customerUrl,
         CustomerAccountManagement $customerAccountManagement,
         SubscriptionManagerInterface $subscriptionManager,
-        EmailValidator $emailValidator = null
+        EmailValidator $emailValidator = null,
+        CustomerRepositoryInterface $customerRepository = null
     ) {
         $this->customerAccountManagement = $customerAccountManagement;
         $this->subscriptionManager = $subscriptionManager;
         $this->emailValidator = $emailValidator ?: ObjectManager::getInstance()->get(EmailValidator::class);
+        $this->customerRepository = $customerRepository ?: ObjectManager::getInstance()
+            ->get(CustomerRepositoryInterface::class);
         parent::__construct(
             $context,
             $subscriberFactory,
@@ -165,7 +175,8 @@ public function execute()
                 }
 
                 $storeId = (int)$this->_storeManager->getStore()->getId();
-                $currentCustomerId = $this->getSessionCustomerId($email);
+                $currentCustomerId = $this->getCustomerId($email, $websiteId);
+
                 $subscriber = $currentCustomerId
                     ? $this->subscriptionManager->subscribeCustomer($currentCustomerId, $storeId)
                     : $this->subscriptionManager->subscribe($email, $storeId);
@@ -182,28 +193,26 @@ public function execute()
         }
         /** @var Redirect $redirect */
         $redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $redirectUrl = $this->_redirect->getRedirectUrl();
         return $redirect->setUrl($redirectUrl);
     }
 
     /**
-     * Get customer id from session if he is owner of the email
+     * Check if customer with provided email exists and return its id
      *
      * @param string $email
+     * @param int $websiteId
      * @return int|null
      */
-    private function getSessionCustomerId(string $email): ?int
+    private function getCustomerId(string $email, int $websiteId): ?int
     {
-        if (!$this->_customerSession->isLoggedIn()) {
+        try {
+            $customer = $this->customerRepository->get($email, $websiteId);
+            return (int)$customer->getId();
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             return null;
         }
-
-        $customer = $this->_customerSession->getCustomerDataObject();
-        if ($customer->getEmail() !== $email) {
-            return null;
-        }
-
-        return (int)$this->_customerSession->getId();
     }
 
     /**

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Newsletter\Model\ResourceModel\Subscriber as SubscriberResource;
 use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection as GridCollection;
 use Magento\TestFramework\TestCase\AbstractController;
 use Laminas\Stdlib\Parameters;
 
@@ -107,17 +108,33 @@ public function subscribersDataProvider(): array
 
     /**
      * @magentoDataFixture Magento/Customer/_files/new_customer.php
+     * @dataProvider emailAndStatusDataProvider
      *
      * @return void
      */
-    public function testNewActionUsedEmail(): void
+    public function testNewActionUsedEmail($email, $subscriptionType): void
     {
-        $this->prepareRequest('new_customer@example.com');
+        $this->prepareRequest($email);
         $this->dispatch('newsletter/subscriber/new');
 
+        /** @var GridCollection $gridCollection */
+        $gridCollection = $this->_objectManager->create(GridCollection::class);
+        $item = $gridCollection->getFirstItem();
+        self::assertEquals($subscriptionType, (int)$item->getType());
         $this->performAsserts('Thank you for your subscription.');
     }
 
+    /**
+     * @return array
+     */
+    public function emailAndStatusDataProvider()
+    {
+        return [
+            'customer' => ['new_customer@example.com', 2],
+            'not_a_customer' => ['not_a_customer@gmail.com', 1],
+        ];
+    }
+
     /**
      * @magentoDataFixture Magento/Customer/_files/new_customer.php
      *