ACP2E-2098: added a new fix

Author: alzota

app/code/Magento/QuoteGraphQl/Plugin/ProductAttributesExtender.php

@@ -16,15 +16,6 @@
  */
 class ProductAttributesExtender
 {
-    /**
-     * Validation pattern for attribute code
-     */
-    private const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
-
-    private const ATTRIBUTE_CODE_MAX_LENGTH = 60;
-
-    private const ATTRIBUTE_CODE_MIN_LENGTH = 1;
-
     /**
      * @var Fields
      */
@@ -57,65 +48,6 @@ public function __construct(
         $this->attributeCollectionFactory = $attributeCollectionFactory;
     }
 
-    /**
-     * Get only attribute codes that pass validation
-     *
-     * @return array
-     */
-    private function getValidAttributeCodes(): array
-    {
-        return array_filter($this->fields->getFieldsUsedInQuery(), [$this,'validateAttributeCode']);
-    }
-
-    /**
-     * Validate attribute code
-     *
-     * @param string|int $attributeCode
-     * @return bool
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function validateAttributeCode(string|int $attributeCode): bool
-    {
-        $attributeCode = trim((string)$attributeCode);
-        if (strlen($attributeCode) > 0
-            && !preg_match(self::VALIDATION_RULE_PATTERN, $attributeCode)
-        ) {
-            return false;
-        }
-
-        $minLength = self::ATTRIBUTE_CODE_MIN_LENGTH;
-        $maxLength = self::ATTRIBUTE_CODE_MAX_LENGTH;
-
-        $isAllowedLength = filter_var(
-            strlen($attributeCode),
-            FILTER_VALIDATE_INT,
-            ['options' => [
-                'min_range' => $minLength, 'max_range' => $maxLength]
-            ]
-        );
-
-        if (!$isAllowedLength) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get attributes based on validated codes
-     *
-     * @return array
-     */
-    private function getAttributes(): array
-    {
-        $attributeCollection = $this->attributeCollectionFactory->create()
-            ->removeAllFieldsFromSelect()
-            ->addFieldToSelect('attribute_code')
-            ->setCodeFilter($this->getValidAttributeCodes())
-            ->load();
-        return $attributeCollection->getColumnValues('attribute_code');
-    }
-
     /**
      * Add requested product attributes.
      *
@@ -126,10 +58,17 @@ private function getAttributes(): array
      */
     public function afterGetProductAttributes(QuoteConfig $subject, array $result): array
     {
-        $hash = hash('sha256', json_encode($this->fields->getFieldsUsedInQuery()));
-        if (!$this->fieldsHash || $this->fieldsHash !== $hash) {
-            $this->fieldsHash = hash('sha256', json_encode($this->fields->getFieldsUsedInQuery()));
-            $this->attributes = $this->getAttributes();
+
+        $fieldsUsedInQuery = $this->fields->getFieldsUsedInQuery();
+        $fieldsHash = hash('sha256', json_encode($fieldsUsedInQuery));
+        if (!$this->fieldsHash || $this->fieldsHash !== $fieldsHash) {
+            $this->fieldsHash = hash('sha256', json_encode($fieldsUsedInQuery));
+            $attributeCollection = $this->attributeCollectionFactory->create()
+                ->removeAllFieldsFromSelect()
+                ->addFieldToSelect('attribute_code')
+                ->setCodeFilter($fieldsUsedInQuery)
+                ->load();
+            $this->attributes = $attributeCollection->getColumnValues('attribute_code');
         }
         $attributes = $this->attributes;
 

lib/internal/Magento/Framework/GraphQl/Query/Fields.php

@@ -101,8 +101,9 @@ private function extractVariables(array &$fields, array $variables): void
         foreach ($variables as $key => $value) {
             if (is_array($value)) {
                 $this->extractVariables($fields, $value);
+            } else {
+                $fields[$key] = $key;
             }
-            $fields[$key] = $key;
         }
     }