MC-29102: [2.4.x] [Magento Cloud] Customer receives newsletter unsubscription email after registering for new account

Author: DianaRusin

app/code/Magento/Newsletter/Controller/Ajax/Status.php

@@ -6,7 +6,6 @@
 namespace Magento\Newsletter\Controller\Ajax;
 
 use Magento\Framework\App\Action;
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
@@ -16,7 +15,7 @@
 /**
  * Newsletter subscription status verification controller.
  */
-class Status extends Action\Action implements HttpGetActionInterface
+class Status extends Action\Action implements Action\HttpGetActionInterface
 {
     /**
      * @var EmailAddressValidator
@@ -67,15 +66,11 @@ public function execute()
                 $response['subscribed'] = $this->guestSubscriptionChecker->isSubscribed($email);
             }
         } catch (LocalizedException $exception) {
-            $response = [
-                'errors' => true,
-                'message' => $exception->getMessage(),
-            ];
+            $this->logger->error($exception->getMessage());
+            $response['errors'] = true;
         } catch (\Throwable $exception) {
-            $response = [
-                'errors' => true,
-                'message' => __('Something went wrong.'),
-            ];
+            $this->logger->error($exception->getMessage());
+            $response['errors'] = true;
         }
 
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */

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

@@ -19,6 +19,7 @@ class GuestSubscriptionChecker
      * @var ResourceConnection
      */
     private $resourceConnection;
+
     /**
      * @var StoreManagerInterface
      */
@@ -39,6 +40,7 @@ public function __construct(ResourceConnection $resourceConnection, StoreManager
      *
      * @param string $subscriberEmail
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function isSubscribed(string $subscriberEmail): bool
     {
@@ -53,9 +55,7 @@ public function isSubscribed(string $subscriberEmail): bool
                 ->where('customer_id = 0')
                 ->limit(1);
 
-            $result = (bool)$connection->fetchOne($select);
-
-            return $result;
+            return (bool)$connection->fetchOne($select);
         }
 
         return false;

app/code/Magento/Newsletter/view/frontend/web/js/newsletter-sign-up.js

@@ -6,11 +6,10 @@
 define([
     'jquery',
     'uiElement',
-    'mage/storage',
     'mage/url',
     'subscriptionStatusResolver',
     'mage/validation'
-], function ($, Component, storage, urlBuilder, subscriptionStatusResolver) {
+], function ($, Component, urlBuilder, subscriptionStatusResolver) {
     'use strict';
 
     return Component.extend({

app/code/Magento/Newsletter/view/frontend/web/js/subscription-status-resolver.js

@@ -5,9 +5,8 @@
 
 define([
     'jquery',
-    'mage/storage',
     'mage/url'
-], function ($, storage, urlBuilder) {
+], function ($, urlBuilder) {
     'use strict';
 
     return function (email, deferred) {
@@ -17,7 +16,11 @@ define([
                 email: email
             }
         ).done(function (response) {
-            deferred.resolve(response.subscribed);
+            if (response.errors) {
+                deferred.reject();
+            } else {
+                deferred.resolve(response.subscribed);
+            }
         }).fail(function () {
             deferred.reject();
         });

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Ajax/StatusTest.php

@@ -7,32 +7,31 @@
 
 namespace Magento\Newsletter\Controller\Ajax;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\TestFramework\TestCase\AbstractController;
 
 /**
  * Test Subscriber status ajax
  */
 class StatusTest extends AbstractController
 {
-    const STATUS_NOT_SUBSCRIBED = '"subscribed":false';
-
     /**
      * Check newsletter subscription status verification
      *
      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
      * @dataProvider ajaxSubscriberDataProvider
+     * @param string $expStatus
      * @param string $email
-     * @param string $expected
      *
      * @return void
      */
-    public function testExecute(string $email, string $expected): void
+    public function testExecute(string $expStatus, string $email): void
     {
         $this->getRequest()->setParam('email', $email);
         $this->dispatch('newsletter/ajax/status');
-        $actual  = $this->getResponse()->getBody();
+        $actual = $this->_objectManager->get(Json::class)->unserialize($this->getResponse()->getBody());
 
-        $this->assertContains($expected, $actual);
+        $this->assertEquals($expStatus, $actual['subscribed']);
     }
 
     /**
@@ -44,26 +43,12 @@ public function testExecute(string $email, string $expected): void
     public function ajaxSubscriberDataProvider(): array
     {
         return [
-            [
-                '',
-                self::STATUS_NOT_SUBSCRIBED,
-            ],
-            [
-                '[email protected]',
-                self::STATUS_NOT_SUBSCRIBED,
-            ],
-            [
-                '[email protected]',
-                self::STATUS_NOT_SUBSCRIBED,
-            ],
-            [
-                '[email protected]',
-                '"subscribed":true',
-            ],
-            [
-                '[email protected]',
-                self::STATUS_NOT_SUBSCRIBED,
-            ],
+            [false, ''],
+            [false, '[email protected]'],
+            [false, '[email protected]'],
+            [true, '[email protected]'],
+            [false, '[email protected]'],
+            [false, 'invalid_email.com'],
         ];
     }
 }

dev/tests/js/jasmine/tests/app/code/Magento/Newsletter/frontend/js/newsletter-sign-up.test.js

@@ -33,9 +33,6 @@ define([
         injector.mock(mocks);
         injector.require(['Magento_Newsletter/js/newsletter-sign-up'], function (Constr) {
             obj = new Constr({
-                provider: 'provName',
-                name: '',
-                index: '',
                 submitButton: '#button',
                 signUpElement: '#is_subscribed'
             }, '#email_address');
@@ -67,7 +64,6 @@ define([
         it('Verify Subscription is checked', function () {
             emailElem.val('[email protected]');
             checkbox.prop('checked', true);
-            expect(checkbox.is(':checked')).toBeTruthy();
 
             obj.updateSignUpStatus();
 
@@ -78,7 +74,6 @@ define([
 
         it('Verify sign-up process without email', function () {
             checkbox.prop('checked', false);
-            expect(checkbox.is(':checked')).toBeFalsy();
 
             obj.updateSignUpStatus();
 
@@ -89,7 +84,6 @@ define([
         it('Verify sign-up process with incorrect email', function () {
             emailElem.val('emailexample.com');
             checkbox.prop('checked', false);
-            expect(checkbox.is(':checked')).toBeFalsy();
 
             obj.updateSignUpStatus();
 
@@ -100,7 +94,6 @@ define([
         it('Verify Subscription with correct data', function () {
             emailElem.val('[email protected]');
             checkbox.prop('checked', false);
-            expect(checkbox.is(':checked')).toBeFalsy();
 
             obj.updateSignUpStatus();
 
@@ -113,7 +106,6 @@ define([
             resolveStatus(false);
             emailElem.val('[email protected]');
             checkbox.prop('checked', false);
-            expect(checkbox.is(':checked')).toBeFalsy();
 
             obj.updateSignUpStatus();