[Magento Community Engineering] Community Contributions - 2.4-develop-express-lane-prs

 - merged with '2.4-develop-fast-lane-prs' branch

Author: magento-engcom-team

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -196,6 +196,7 @@ public function getCacheKeyInfo()
         $cacheKeys['display_minimal_price'] = $this->getDisplayMinimalPrice();
         $cacheKeys['is_product_list'] = $this->isProductList();
         $cacheKeys['customer_group_id'] = $this->getSaleableItem()->getCustomerGroupId();
+        $cacheKeys['zone'] = $this->getZone();
         return $cacheKeys;
     }
 

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -47,6 +47,7 @@
  */
 class Product extends AbstractEntity
 {
+    private const DEFAULT_GLOBAL_MULTIPLE_VALUE_SEPARATOR = ',';
     public const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
     private const HASH_ALGORITHM = 'sha256';
 
@@ -2826,6 +2827,10 @@ private function parseAttributesWithWrappedValues($attributesData)
     public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_LINE_SEPARATOR)
     {
         if (empty($this->_parameters[Import::FIELDS_ENCLOSURE])) {
+            if ($this->getMultipleValueSeparator() !== self::DEFAULT_GLOBAL_MULTIPLE_VALUE_SEPARATOR) {
+                $delimiter = $this->getMultipleValueSeparator();
+            }
+
             return explode($delimiter, $values);
         }
         if (preg_match_all('~"((?:[^"]|"")*)"~', $values, $matches)) {

app/code/Magento/JwtFrameworkAdapter/Model/JwsManager.php

@@ -93,10 +93,6 @@ public function build(JwsInterface $jws, EncryptionSettingsInterface $encryption
         $builder = $builder->withPayload($jws->getPayload()->getContent());
         for ($i = 0; $i < $signaturesCount; $i++) {
             $jwk = $encryptionSettings->getJwkSet()->getKeys()[$i];
-            $alg = $jwk->getAlgorithm();
-            if (!$alg) {
-                throw new EncryptionException('Algorithm is required for JWKs');
-            }
             $protected = [];
             if ($jws->getPayload()->getContentType()) {
                 $protected['cty'] = $jws->getPayload()->getContentType();
@@ -107,7 +103,10 @@ public function build(JwsInterface $jws, EncryptionSettingsInterface $encryption
             if ($jws->getProtectedHeaders()) {
                 $protected = array_merge($protected, $this->extractHeaderData($jws->getProtectedHeaders()[$i]));
             }
-            $protected['alg'] = $alg;
+            $protected['alg'] = $protected['alg'] ?? $jwk->getAlgorithm();
+            if (!$protected['alg']) {
+                throw new EncryptionException('Algorithm is required for JWKs');
+            }
             $unprotected = [];
             if ($jws->getUnprotectedHeaders()) {
                 $unprotected = $this->extractHeaderData($jws->getUnprotectedHeaders()[$i]);

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductValidationTest.php

@@ -373,4 +373,32 @@ public function testProductWithInvalidWeight()
             $errors->getErrorByRowNumber(1)[0]->getErrorMessage()
         );
     }
+
+    /**
+     * Test validate multiselect values with custom separator
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testValidateMultiselectValuesWithCustomSeparator(): void
+    {
+        $pathToFile = __DIR__ . './../_files/products_with_custom_multiselect_values_separator.csv';
+        $filesystem = $this->objectManager->create(Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(Csv::class, ['file' => $pathToFile, 'directory' => $directory]);
+        $params = [
+            'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+            'entity' => 'catalog_product',
+            Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR => '|||'
+        ];
+
+        $errors = $this->_model->setParameters($params)
+            ->setSource($source)
+            ->validateData();
+
+        $this->assertEmpty($errors->getAllErrors());
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_custom_multiselect_values_separator.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,product_type,name,price,additional_attributes
+simple_ms_2,,simple,"With Multiselect 2",10,"multiselect_attribute=Option 2|||Option 3"

dev/tests/integration/testsuite/Magento/JwtFrameworkAdapter/Model/JwsManagerTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\JwtFrameworkAdapter\Model;
+
+class JwsManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        parent::setUp();
+    }
+
+    public function testCreatingJwsWithAlgorithmSetInHeadersDirectly(): void
+    {
+        $secret = "ZXF1YXRpb24tS2VudHVja3ktY29udGludWVkLWRpZmZlcmVuY2U=";
+        $payload = json_encode([
+            'MyCustomClaim' => 'some value', // not important at all
+            'nbf' => time(),
+            'exp' => time() + 600,
+            'iat' => time()
+        ]);
+        $header = [
+            'alg' => 'HS256',
+            'typ' => 'JWT'
+        ];
+
+        /** @var \Magento\Framework\Jwt\JwkFactory $jwkFactory */
+        $jwkFactory = $this->objectManager->create(\Magento\Framework\Jwt\JwkFactory::class);
+        $jwk = $jwkFactory->createFromData(['kty' => 'oct', 'k' => $secret]);
+
+        /** @var \Magento\JwtFrameworkAdapter\Model\JwsFactory $jwsFactory */
+        $jwsFactory = $this->objectManager->create(\Magento\JwtFrameworkAdapter\Model\JwsFactory::class);
+        $jws = $jwsFactory->create($header, $payload, null);
+
+        /** @var \Magento\Framework\Jwt\Jws\JwsSignatureSettingsInterface $encryptionSettings */
+        $encryptionSettings = $this->objectManager->create(
+            \Magento\Framework\Jwt\Jws\JwsSignatureJwks::class,
+            [
+                'jwk' => $jwk
+            ]
+        );
+
+        /** @var \Magento\JwtFrameworkAdapter\Model\JwsManager $jwsManager */
+        $jwsManager = $this->objectManager->create(\Magento\JwtFrameworkAdapter\Model\JwsManager::class);
+
+        $token = $jwsManager->build($jws, $encryptionSettings);
+
+        $this->assertIsString($token);
+    }
+}