[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,8 +6,8 @@
 namespace Magento\Newsletter\Controller\Ajax;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
 use Magento\Newsletter\Model\GuestSubscriptionChecker;
 use Psr\Log\LoggerInterface;
@@ -65,15 +65,12 @@ public function execute()
             if (!empty($email) && $this->emailAddressValidator->isValid($email)) {
                 $response['subscribed'] = $this->guestSubscriptionChecker->isSubscribed($email);
             }
-        } catch (LocalizedException $exception) {
-            $this->logger->error($exception->getMessage());
-            $response['errors'] = true;
         } catch (\Throwable $exception) {
             $this->logger->error($exception->getMessage());
             $response['errors'] = true;
         }
 
-        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        /** @var Json $resultJson */
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
 
         return $resultJson->setData($response);

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

@@ -51,8 +51,8 @@ define([
 
             subscriptionStatusResolver(email, newsletterSubscription);
 
-            $.when(newsletterSubscription).done(function (isSubscribed) {
-                $(self.signUpElement).prop('checked', isSubscribed);
+            $.when(newsletterSubscription).done(function () {
+                $(self.signUpElement).prop('checked', true);
             }).always(function () {
                 $(self.submitButton).prop('disabled', false);
             });

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

@@ -16,10 +16,10 @@ define([
                 email: email
             }
         ).done(function (response) {
-            if (response.errors) {
+            if (response.errors || !response.subscribed) {
                 deferred.reject();
             } else {
-                deferred.resolve(response.subscribed);
+                deferred.resolve();
             }
         }).fail(function () {
             deferred.reject();

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

@@ -7,14 +7,28 @@
 
 namespace Magento\Newsletter\Controller\Ajax;
 
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 
 /**
  * Test Subscriber status ajax
  */
 class StatusTest extends AbstractController
 {
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->json = $this->_objectManager->get(SerializerInterface::class);
+    }
+
     /**
      * Check newsletter subscription status verification
      *
@@ -29,7 +43,7 @@ public function testExecute(string $expStatus, string $email): void
     {
         $this->getRequest()->setParam('email', $email);
         $this->dispatch('newsletter/ajax/status');
-        $actual = $this->_objectManager->get(Json::class)->unserialize($this->getResponse()->getBody());
+        $actual = $this->json->unserialize($this->getResponse()->getBody());
 
         $this->assertEquals($expStatus, $actual['subscribed']);
     }
@@ -43,12 +57,11 @@ public function testExecute(string $expStatus, string $email): void
     public function ajaxSubscriberDataProvider(): array
     {
         return [
-            [false, ''],
-            [false, 'sample@email.com'],
-            [false, 'customer@example.com'],
-            [true, 'customer_two@example.com'],
-            [false, 'customer_confirm@example.com'],
-            [false, 'invalid_email.com'],
+            'empty_string' => [false, ''],
+            'unsubscribed_email' => [false, 'sample@email.com'],
+            'registered_email' => [false, 'customer@example.com'],
+            'subscribed_email' => [true, 'customer_two@example.com'],
+            'invalid_email' => [false, 'invalid_email.com'],
         ];
     }
 }

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

@@ -16,9 +16,13 @@ define([
         checkbox,
         emailElem,
         button,
-        resolveStatus = ko.observable(true),
+        response = ko.observable({}),
         resolverMock = jasmine.createSpy('subscription-status-resolver', function (email, deferred) {
-            deferred.resolve(resolveStatus());
+            if (response().errors || !response().subscribed) {
+                deferred.reject();
+            } else {
+                deferred.resolve();
+            }
         }).and.callThrough(),
         mocks = {
             'Magento_Newsletter/js/subscription-status-resolver': resolverMock
@@ -61,7 +65,7 @@ define([
             expect(typeof obj.element).toEqual('string');
         });
 
-        it('Verify Subscription is checked', function () {
+        it('Check sign-up process when Subscription is checked', function () {
             emailElem.val('email@example.com');
             checkbox.prop('checked', true);
 
@@ -72,7 +76,7 @@ define([
             expect(checkbox.is(':checked')).toBeTruthy();
         });
 
-        it('Verify sign-up process without email', function () {
+        it('Check sign-up process without email', function () {
             checkbox.prop('checked', false);
 
             obj.updateSignUpStatus();
@@ -81,7 +85,7 @@ define([
             expect(checkbox.is(':checked')).toBeFalsy();
         });
 
-        it('Verify sign-up process with incorrect email', function () {
+        it('Check sign-up process with incorrect email', function () {
             emailElem.val('emailexample.com');
             checkbox.prop('checked', false);
 
@@ -91,7 +95,11 @@ define([
             expect(checkbox.is(':checked')).toBeFalsy();
         });
 
-        it('Verify Subscription with correct data', function () {
+        it('Check Subscription with correct data', function () {
+            response({
+                subscribed: true,
+                errors: false
+            });
             emailElem.val('email@example.com');
             checkbox.prop('checked', false);
 
@@ -102,8 +110,25 @@ define([
             expect(button.is(':disabled')).toBeFalsy();
         });
 
-        it('Verify sign-up process with non-subscribed email', function () {
-            resolveStatus(false);
+        it('Check sign-up process with non-subscribed email', function () {
+            response({
+                subscribed: false,
+                errors: false
+            });
+            emailElem.val('email@example.com');
+            checkbox.prop('checked', false);
+
+            obj.updateSignUpStatus();
+
+            expect(resolverMock).toHaveBeenCalled();
+            expect(checkbox.is(':checked')).toBeFalsy();
+        });
+
+        it('Check sign-up process with errors', function () {
+            response({
+                subscribed: true,
+                errors: true
+            });
             emailElem.val('email@example.com');
             checkbox.prop('checked', false);