ACP2E-961: Customer attribute 'Is required' attribute is not properly overridden per website scope in Admin

Author: viktym

app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php

@@ -23,6 +23,8 @@
 
 /**
  * Class for validation of customer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
 {
@@ -124,6 +126,7 @@ public function __construct(
      *
      * @param \Magento\Framework\DataObject $response
      * @return CustomerInterface|null
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _validateCustomer($response)
     {
@@ -158,7 +161,7 @@ protected function _validateCustomer($response)
                 $entity_id = $submittedData['entity_id'];
                 $customer->setId($entity_id);
             }
-            if (isset($data['website_id'])) {
+            if (isset($data['website_id']) && is_numeric($data['website_id'])) {
                 $website = $this->storeManager->getWebsite($data['website_id']);
                 $storeId = current($website->getStoreIds());
                 $this->storeManager->setCurrentStore($storeId);

app/code/Magento/Customer/Model/AttributeMetadataResolver.php

@@ -225,7 +225,7 @@ private function modifyGroupAttributeMeta(AttributeInterface $attribute): void
     {
         if ($attribute->getAttributeCode() === 'group_id') {
             $defaultGroup = $this->groupManagement->getDefaultGroup();
-            $defaultGroupId = !empty($defaultGroup) ? $defaultGroup->getId() : null;
+            $defaultGroupId = $defaultGroup->getId();
             $attribute->setDataUsingMethod(self::$metaProperties['default'], $defaultGroupId);
         }
     }

app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php

@@ -26,6 +26,8 @@
 
 /**
  * Refactored version of Magento\Customer\Model\Customer\DataProvider with eliminated usage of addresses collection.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProviderWithDefaultAddresses extends AbstractDataProvider
 {
@@ -161,7 +163,6 @@ public function getData(): array
                 array_flip(self::$forbiddenCustomerFields)
             );
             $this->prepareCustomAttributeValue($result['customer']);
-            unset($result['address']);
 
             $result['default_billing_address'] = $this->prepareDefaultAddress(
                 $customer->getDefaultBillingAddress()

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -204,13 +204,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $prevCustomerData = $prevCustomerDataArr = null;
         if ($customer->getId()) {
             $prevCustomerData = $this->getById($customer->getId());
-            $prevCustomerDataArr = $prevCustomerData->__toArray();
-            if (isset($prevCustomerDataArr[CustomerInterface::CUSTOM_ATTRIBUTES])) {
-                foreach ($prevCustomerDataArr[CustomerInterface::CUSTOM_ATTRIBUTES] as $attribute) {
-                    $prevCustomerDataArr[$attribute['attribute_code']] = $attribute['value'];
-                }
-                unset($prevCustomerDataArr[CustomerInterface::CUSTOM_ATTRIBUTES]);
-            }
+            $prevCustomerDataArr = $this->prepareCustomerData($prevCustomerData->__toArray());
         }
         /** @var $customer \Magento\Customer\Model\Data\Customer */
         $customerArr = $customer->__toArray();
@@ -491,6 +485,7 @@ public function deleteById($customerId)
      * Helper function that adds a FilterGroup to the collection.
      *
      * @deprecated 101.0.0
+     * @see no alternative
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
@@ -534,4 +529,21 @@ private function setCustomerGroupId($customerModel, $customerArr, $prevCustomerD
             $customerModel->setGroupId($prevCustomerDataArr['group_id']);
         }
     }
+
+    /**
+     * Prepare customer data.
+     *
+     * @param array $customerData
+     * @return array
+     */
+    private function prepareCustomerData(array $customerData): array
+    {
+        if (isset($customerData[CustomerInterface::CUSTOM_ATTRIBUTES])) {
+            foreach ($customerData[CustomerInterface::CUSTOM_ATTRIBUTES] as $attribute) {
+                $customerData[$attribute['attribute_code']] = $attribute['value'];
+            }
+            unset($customerData[CustomerInterface::CUSTOM_ATTRIBUTES]);
+        }
+        return $customerData;
+    }
 }

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php

@@ -44,6 +44,8 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -284,6 +286,13 @@ protected function setUp(): void
         $this->emailNotificationMock = $this->getMockBuilder(EmailNotificationInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $website = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $website->method('getStoreIds')
+            ->willReturn([1]);
+        $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $storeManager->method('getWebsite')
+            ->willReturn($website);
 
         $objectManager = new ObjectManager($this);
 
@@ -310,6 +319,7 @@ protected function setUp(): void
                 'addressRepository' => $this->customerAddressRepositoryMock,
                 'addressMapper' => $this->customerAddressMapperMock,
                 'subscriptionManager' => $this->subscriptionManager,
+                'storeManager' => $storeManager,
             ]
         );
 

app/code/Magento/Customer/view/adminhtml/web/js/form/element/website.js

@@ -25,12 +25,15 @@ define([
                 option = this.getOption(value);
 
             customerAttributes.forEach(element => {
-                var requiredWebsites = element.validation['required-entry-website']
-                if (_.isArray(requiredWebsites) && requiredWebsites.includes(parseInt(value))) {
+                var requiredWebsites = element.validation['required-entry-website'];
+                if (!_.isArray(requiredWebsites)) {
+                    return;
+                }
+                if (requiredWebsites.includes(parseInt(value))) {
                     element.validation['required-entry'] = true;
                     element.required(true);
                 } else {
-                    element.validation['required-entry'] = false;
+                    delete element.validation['required-entry'];
                     element.required(false);
                 }
             });