Merge remote-tracking branch 'mainline/2.4.1-develop' into 2.4.1-reverts

Author: Stanislav Idolov

app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\Response\HttpInterface;
+
+class AppendNoStoreCacheHeader
+{
+    /**
+     * Set cache-control header
+     *
+     * @param FrontControllerInterface $controller
+     * @param HttpInterface $response
+     * @return HttpInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDispatch(FrontControllerInterface $controller, HttpInterface $response): HttpInterface
+    {
+        $response->setHeader('Cache-Control', 'no-store');
+        return $response;
+    }
+}

app/code/Magento/PageCache/etc/webapi_rest/di.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
+    </type>
+</config>

app/code/Magento/PageCache/etc/webapi_soap/di.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
+    </type>
+</config>

app/code/Magento/QuoteGraphQl/etc/graphql/events.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
+    </event>
+</config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Registry;
 use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -57,23 +58,31 @@ class CheckoutEndToEndTest extends GraphQlAbstract
      */
     private $orderRepository;
 
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
     /**
      * @var array
      */
     private $headers = [];
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        parent::setUp();
-
         $objectManager = Bootstrap::getObjectManager();
+
         $this->registry = $objectManager->get(Registry::class);
         $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
         $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->orderFactory = $objectManager->get(OrderFactory::class);
     }
 
     /**
@@ -97,8 +106,13 @@ public function testCheckoutWorkflow()
         $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
         $this->setPaymentMethod($cartId, $paymentMethod);
 
-        $orderId = $this->placeOrder($cartId);
-        $this->checkOrderInHistory($orderId);
+        $orderIncrementId = $this->placeOrder($cartId);
+
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId($orderIncrementId);
+
+        $this->checkOrderInHistory($orderIncrementId);
+        $this->assertNotEmpty($order->getEmailSent());
     }
 
     /**
@@ -208,7 +222,7 @@ private function createEmptyCart(): string
     private function addProductToCart(string $cartId, float $qty, string $sku): void
     {
         $query = <<<QUERY
-mutation {  
+mutation {
   addSimpleProductsToCart(
     input: {
       cart_id: "{$cartId}"
@@ -350,7 +364,7 @@ private function setShippingMethod(string $cartId, array $method): array
         $query = <<<QUERY
 mutation {
   setShippingMethodsOnCart(input:  {
-    cart_id: "{$cartId}", 
+    cart_id: "{$cartId}",
     shipping_methods: [
       {
          carrier_code: "{$method['carrier_code']}"

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Registry;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -40,6 +41,11 @@ class PlaceOrderTest extends GraphQlAbstract
      */
     private $registry;
 
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
     /**
      * @inheritdoc
      */
@@ -49,6 +55,7 @@ protected function setUp(): void
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->orderFactory = $objectManager->get(OrderFactory::class);
         $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
     }
 
@@ -80,6 +87,10 @@ public function testPlaceOrder()
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
         self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        $orderIncrementId = $response['placeOrder']['order']['order_number'];
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId($orderIncrementId);
+        $this->assertNotEmpty($order->getEmailSent());
     }
 
     /**