AC-6695: Guest Checkout Fix

Author: pawan-adobe-security

dev/tests/api-functional/testsuite/Magento/GraphQl/Newsletter/Customer/SubscribeEmailToNewsletterTest.php

@@ -8,11 +8,14 @@
 namespace Magento\GraphQl\Newsletter\Customer;
 
 use Exception;
+use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Newsletter\Model\ResourceModel\Subscriber as SubscriberResourceModel;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -40,13 +43,18 @@ class SubscribeEmailToNewsletterTest extends GraphQlAbstract
      * @var SubscriberResourceModel
      */
     private $subscriberResource;
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
 
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
         $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
         $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
@@ -146,10 +154,17 @@ public function testNewsletterSubscriptionWithAnotherCustomerEmail()
     {
         $query = $this->getQuery('customer2@search.example.com');
 
-        $this->expectException(Exception::class);
-        $this->expectExceptionMessage('Cannot create a newsletter subscription.' . "\n");
-
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer@search.example.com'));
+        $guestLoginConfig = $this->scopeConfig->getValue(
+            AccountManagement::GUEST_CHECKOUT_LOGIN_OPTION_SYS_CONFIG,
+            ScopeInterface::SCOPE_WEBSITE,
+            1
+        );
+
+        if ($guestLoginConfig) {
+            $this->expectException(Exception::class);
+            $this->expectExceptionMessage('Cannot create a newsletter subscription.' . "\n");
+            $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer@search.example.com'));
+        }
     }
 
     /**

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

@@ -8,12 +8,15 @@
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 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\Store\Model\ScopeInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 use Laminas\Stdlib\Parameters;
 
@@ -222,8 +225,18 @@ public function testWithEmailAssignedToAnotherCustomer(): void
         $this->session->loginById(1);
         $this->prepareRequest('customer2@search.example.com');
         $this->dispatch('newsletter/subscriber/new');
+        $scopeConfig = $this->_objectManager->get(ScopeConfigInterface::class);
+        $guestLoginConfig = $scopeConfig->getValue(
+            AccountManagement::GUEST_CHECKOUT_LOGIN_OPTION_SYS_CONFIG,
+            ScopeInterface::SCOPE_WEBSITE,
+            1
+        );
 
-        $this->performAsserts('This email address is already assigned to another user.');
+        if ($guestLoginConfig) {
+            $this->performAsserts('This email address is already assigned to another user.');
+        } else {
+            $this->performAsserts('This email address is already subscribed.');
+        }
     }
 
     /**