Merge branch 'AC-8490' into cia-2.4.7-beta2-develop-bugfix-07112023

Author: pawan-adobe-security

app/code/Magento/Customer/Plugin/Webapi/Controller/Rest/ValidateCustomerData.php

@@ -28,8 +28,8 @@ class ValidateCustomerData
      */
     public function beforeOverride(ParamsOverrider $subject, array $inputData, array $parameters): array
     {
-        if (isset($inputData[self:: CUSTOMER_KEY])) {
-            $inputData[self:: CUSTOMER_KEY] = $this->validateInputData($inputData[self:: CUSTOMER_KEY]);
+        if (isset($inputData[self::CUSTOMER_KEY])) {
+            $inputData[self::CUSTOMER_KEY] = $this->validateInputData($inputData[self::CUSTOMER_KEY]);
         }
         return [$inputData, $parameters];
     }
@@ -45,7 +45,7 @@ private function validateInputData(array $inputData): array
         $result = [];
 
         $data = array_filter($inputData, function ($k) use (&$result) {
-            $key = is_string($k) ? strtolower($k) : $k;
+            $key = is_string($k) ? strtolower(str_replace('_', "", $k)) : $k;
             return !isset($result[$key]) && ($result[$key] = true);
         }, ARRAY_FILTER_USE_KEY);
 

app/code/Magento/Customer/Test/Unit/Plugin/Webapi/Controller/Rest/ValidateCustomerDataTest.php

@@ -8,8 +8,8 @@
 namespace Magento\Customer\Test\Unit\Plugin\Webapi\Controller\Rest;
 
 use Exception;
-use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Plugin\Webapi\Controller\Rest\ValidateCustomerData;
+use Magento\Framework\App\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
@@ -75,40 +75,48 @@ public function dataProviderInputData(): array
     {
         return [
             [
-                ['customer' =>
-                    [
+                ['customer' => [
                         'id' => -1,
                         'Id' => 1,
-                        'name' =>
-                            [
+                        'name' => [
                                 'firstName' => 'Test',
                                 'LastName' => 'user'
                             ],
                         'isHavingOwnHouse' => 1,
-                        'address' =>
-                            [
+                        'address' => [
                                 'street' => '1st Street',
                                 'Street' => '3rd Street',
                                 'city' => 'London'
                             ],
                     ]
                 ],
-                ['customer' =>
-                    [
+                ['customer' => [
                         'id' => -1,
-                        'name' =>
-                            [
+                        'name' => [
                                 'firstName' => 'Test',
                                 'LastName' => 'user'
                             ],
                         'isHavingOwnHouse' => 1,
-                        'address' =>
-                            [
+                        'address' => [
                                 'street' => '1st Street',
                                 'city' => 'London'
                             ],
                     ]
                 ],
+                ['customer' => [
+                    'id' => -1,
+                    '_Id' => 1,
+                    'name' => [
+                        'firstName' => 'Test',
+                        'LastName' => 'user'
+                    ],
+                    'isHavingOwnHouse' => 1,
+                    'address' => [
+                        'street' => '1st Street',
+                        'city' => 'London'
+                    ],
+                ]
+                ],
             ]
         ];
     }