Merge remote-tracking branch 'origin/MC-42203' into 2.4-develop-pr61

Author: Serhii Balko

app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php

@@ -14,6 +14,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Class for upload customer file attribute
+ */
 class Upload extends Action
 {
     /**
@@ -38,6 +41,11 @@ class Upload extends Action
      */
     private $logger;
 
+    /**
+     * @var string
+     */
+    private $scope;
+
     /**
      * @param Context $context
      * @param FileUploaderFactory $fileUploaderFactory
@@ -65,15 +73,15 @@ public function execute()
             if (empty($_FILES)) {
                 throw new \Exception('$_FILES array is empty.');
             }
-
-            $attributeCode = key($_FILES['customer']['name']);
+            $scope = array_key_first($_FILES);
+            $attributeCode = key($_FILES[$scope]['name']);
             $attributeMetadata = $this->customerMetadataService->getAttributeMetadata($attributeCode);
 
             /** @var FileUploader $fileUploader */
             $fileUploader = $this->fileUploaderFactory->create([
                 'attributeMetadata' => $attributeMetadata,
                 'entityTypeCode' => CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-                'scope' => 'customer',
+                'scope' => $scope,
             ]);
 
             $errors = $fileUploader->validate();