Merge branch '2.4.8-beta1-develop' into AC-9986

Author: mrprabhu92

app/code/Magento/JwtUserToken/Model/SecretBasedJwksFactory.php

@@ -35,6 +35,7 @@ class SecretBasedJwksFactory
     public function __construct(DeploymentConfig $deploymentConfig, JwkFactory $jwkFactory)
     {
         $this->keys = preg_split('/\s+/s', trim((string)$deploymentConfig->get('crypt/key')));
+        $this->keys = [end($this->keys)];
         //Making sure keys are large enough.
         foreach ($this->keys as &$key) {
             $key = str_pad($key, 2048, '&', STR_PAD_BOTH);
@@ -48,6 +49,8 @@ public function __construct(DeploymentConfig $deploymentConfig, JwkFactory $jwkF
      * @param string $algorithm
      * @return Jwk[]
      * @throws \InvalidArgumentException When algorithm is not recognized.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function createFor(string $algorithm): array
     {

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\TaxImportExport\Controller\Adminhtml;
 
 /**
@@ -15,7 +18,7 @@ abstract class Rate extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
+    public const ADMIN_RESOURCE = 'Magento_TaxImportExport::import_export';
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php

@@ -3,12 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ResponseInterface;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ExportPost extends Rate implements HttpPostActionInterface
 {
     /**
      * Export action from import/export tax
@@ -86,16 +91,4 @@ public function execute()
 
         return $this->fileFactory->create('tax_rates.csv', $fileContent, DirectoryList::VAR_DIR);
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed(
-            'Magento_Tax::manage_tax'
-        ) || $this->_authorization->isAllowed(
-            'Magento_TaxImportExport::import_export'
-        );
-    }
 }

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php

@@ -3,14 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ImportPost extends Rate implements HttpPostActionInterface
 {
     /**
-     * import action from import/export tax
+     * Import action from import/export tax
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
@@ -39,16 +44,4 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->getRedirectUrl());
         return $resultRedirect;
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed(
-            'Magento_Tax::manage_tax'
-        ) || $this->_authorization->isAllowed(
-            'Magento_TaxImportExport::import_export'
-        );
-    }
 }

app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rule_edit.xml

@@ -8,7 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="content">
-            <block class="Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport" name="tax-rate-importExport" template="Magento_TaxImportExport::importExport.phtml"/>
+            <block class="Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport" name="tax-rate-importExport"
+                   template="Magento_TaxImportExport::importExport.phtml"  aclResource="Magento_TaxImportExport::import_export"/>
         </referenceBlock>
     </body>
 </page>