Merge branch '2.4-develop' into cia-2.4-develop-bugfixes-07272022

Author: admanesachin

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

@@ -132,9 +132,9 @@ private function convertElementsToSelect($elements, $attributesToConvert)
             $elements[$code]['dataType'] = 'select';
             $elements[$code]['formElement'] = 'select';
 
-            foreach ($options as $key => $value) {
+            foreach ($options as $value) {
                 $elements[$code]['options'][] = [
-                    'value' => $key,
+                    'value' => $value,
                     'label' => $value,
                 ];
             }

app/code/Magento/Checkout/Controller/Cart/EstimatePost.php

@@ -6,9 +6,10 @@
 namespace Magento\Checkout\Controller\Cart;
 
 use Magento\Framework;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Checkout\Model\Cart as CustomerCart;
 
-class EstimatePost extends \Magento\Checkout\Controller\Cart
+class EstimatePost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
@@ -63,9 +64,7 @@ public function execute()
             ->setCity($city)
             ->setPostcode($postcode)
             ->setRegionId($regionId)
-            ->setRegion($region)
-            ->setCollectShippingRates(true);
-        $this->quoteRepository->save($this->cart->getQuote());
+            ->setRegion($region);
         $this->cart->save();
         return $this->_goBack();
     }

app/code/Magento/CustomerGraphQl/Model/Customer/DeleteCustomer.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+
+/**
+ * Delete customer
+ * @codingStandardsIgnoreStart
+ */
+class DeleteCustomer
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Delete customer
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(CustomerInterface $customer): void
+    {
+        try {
+            $this->customerRepository->delete($customer);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}

app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomer.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\CustomerGraphQl\Model\Customer\DeleteCustomer as DeleteCustomerModel;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Registry;
+use Magento\GraphQl\Model\Query\ContextInterface;
+
+/**
+ * Delete customer, used for GraphQL request processing.
+ */
+class DeleteCustomer implements ResolverInterface
+{
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+
+    /**
+     * @var DeleteCustomerModel
+     */
+    private $deleteCustomer;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @param GetCustomer $getCustomer
+     * @param DeleteCustomerModel $deleteCustomer
+     * @param Registry $registry
+     */
+    public function __construct(
+        GetCustomer $getCustomer,
+        DeleteCustomerModel $deleteCustomer,
+        Registry $registry
+    ) {
+        $this->getCustomer = $getCustomer;
+        $this->deleteCustomer = $deleteCustomer;
+        $this->registry = $registry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var ContextInterface $context */
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+
+        $isSecure = $this->registry->registry('isSecureArea');
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        $customer = $this->getCustomer->execute($context);
+        $this->deleteCustomer->execute($customer);
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', $isSecure);
+        return true;
+    }
+}

app/code/Magento/CustomerGraphQl/etc/schema.graphqls

@@ -21,6 +21,7 @@ type Mutation {
     createCustomerV2 (input: CustomerCreateInput! @doc(description: "An input object that defines the customer to be created.")): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create a customer account.")
     updateCustomer (input: CustomerInput! @doc(description: "An input object that defines the customer characteristics to update.")): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Use `updateCustomerV2` instead.")
     updateCustomerV2 (input: CustomerUpdateInput! @doc(description: "An input object that defines the customer characteristics to update.")): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information.")
+    deleteCustomer: Boolean @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomer") @doc(description:"Delete customer account")
     revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token.")
     createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create a billing or shipping address for a customer or guest.")
     updateCustomerAddress(id: Int! @doc(description: "The ID assigned to the customer address."), input: CustomerAddressInput @doc(description: "An input object that contains changes to the customer address.")): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update the billing or shipping address of a customer or guest.")

app/code/Magento/NewRelicReporting/etc/csp_whitelist.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="script-src">
+                <values>
+                    <value id="newrelic-agent" type="host">*.newrelic.com</value>
+                    <value id="newrelic-agent-data" type="host">*.nr-data.net</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <values>
+                    <value id="newrelic-agent" type="host">*.newrelic.com</value>
+                    <value id="newrelic-agent-data" type="host">*.nr-data.net</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -20,21 +20,21 @@
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
 {
     /**
-     * Customer form factory
+     * Customer Metadata form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
      */
     protected $_customerFormFactory;
 
     /**
-     * Json encoder
+     * Framework Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
      */
     protected $_jsonEncoder;
 
     /**
-     * Directory helper
+     * Directory helper Data
      *
      * @var \Magento\Directory\Helper\Data
      */
@@ -48,28 +48,28 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
     protected $options;
 
     /**
-     * Address service
+     * Address service - AddressRepositoryInterface
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      */
     protected $addressService;
 
     /**
-     * Address helper
+     * Customer Address helper
      *
      * @var \Magento\Customer\Helper\Address
      */
     protected $_addressHelper;
 
     /**
-     * Search criteria builder
+     * Search criteria builder for getList calls
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
 
     /**
-     * Filter builder
+     * Filter builder for getList calls
      *
      * @var \Magento\Framework\Api\FilterBuilder
      */
@@ -235,9 +235,13 @@ protected function _prepareForm()
         if ($prefixElement) {
             $prefixOptions = $this->options->getNamePrefixOptions($this->getStore());
             if (!empty($prefixOptions)) {
+                $mappedPrefixOptions = [];
+                foreach ($prefixOptions as $prefix) {
+                    $mappedPrefixOptions[$prefix] = $prefix;
+                }
                 $fieldset->removeField($prefixElement->getId());
                 $prefixField = $fieldset->addField($prefixElement->getId(), 'select', $prefixElement->getData(), '^');
-                $prefixField->setValues($prefixOptions);
+                $prefixField->setValues($mappedPrefixOptions);
                 if ($this->getAddressId()) {
                     $prefixField->addElementValues($this->getAddress()->getPrefix());
                 }
@@ -322,6 +326,7 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst
      * Retrieve Directory Countries collection
      *
      * @deprecated 100.1.3
+     * @see MAGETWO-711174: Introduce deprecated and since doc blocks.
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
     private function getCountriesCollection()
@@ -338,6 +343,7 @@ private function getCountriesCollection()
      * Retrieve Backend Quote Session
      *
      * @deprecated 100.1.3
+     * @see MAGETWO-711174: Introduce deprecated and since doc blocks.
      * @return Quote
      */
     private function getBackendQuoteSession()

app/code/Magento/User/Model/ResourceModel/User.php

@@ -123,6 +123,9 @@ public function recordLogin(ModelUser $user)
             'logdate' => (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
             'lognum' => $user->getLognum() + 1,
         ];
+        
+        $user->setLogdate($data['logdate']);
+        $user->setLognum($data['lognum']);
 
         $condition = ['user_id = ?' => (int)$user->getUserId()];