Merge pull request #97 from magento-cia/2.4.6-develop-2.4-develop-sync-12202022

Sync of 2.4.6-develop with 2.4-develop

Author: dvoskoboinikov

TwoFactorAuth/Observer/ControllerActionPredispatch.php

@@ -22,7 +22,6 @@
 use Magento\TwoFactorAuth\Api\UserConfigRequestManagerInterface;
 use Magento\TwoFactorAuth\Controller\Adminhtml\Tfa\Requestconfig;
 use Magento\TwoFactorAuth\Model\UserConfig\HtmlAreaTokenVerifier;
-use Magento\AdminAdobeIms\Service\ImsConfig;
 
 /**
  * Handle redirection to 2FA page if required
@@ -76,11 +75,6 @@ class ControllerActionPredispatch implements ObserverInterface
      */
     private $userContext;
 
-    /**
-     * @var ImsConfig
-     */
-    private ImsConfig $adminAdobeImsConfig;
-
     /**
      * @param TfaInterface $tfa
      * @param TfaSessionInterface $tfaSession
@@ -90,7 +84,6 @@ class ControllerActionPredispatch implements ObserverInterface
      * @param UrlInterface $url
      * @param AuthorizationInterface $authorization
      * @param UserContextInterface $userContext
-     * @param ImsConfig $adminAdobeImsConfig
      */
     public function __construct(
         TfaInterface $tfa,
@@ -100,8 +93,7 @@ public function __construct(
         ActionFlag $actionFlag,
         UrlInterface $url,
         AuthorizationInterface $authorization,
-        UserContextInterface $userContext,
-        ImsConfig $adminAdobeImsConfig
+        UserContextInterface $userContext
     ) {
         $this->tfa = $tfa;
         $this->tfaSession = $tfaSession;
@@ -111,7 +103,6 @@ public function __construct(
         $this->url = $url;
         $this->authorization = $authorization;
         $this->userContext = $userContext;
-        $this->adminAdobeImsConfig = $adminAdobeImsConfig;
     }
 
     /**
@@ -132,9 +123,6 @@ private function redirect(string $url): void
      */
     public function execute(Observer $observer)
     {
-        if ($this->adminAdobeImsConfig->enabled()) {
-            return;
-        }
         /** @var $controllerAction AbstractAction */
         $controllerAction = $observer->getEvent()->getData('controller_action');
         $this->action = $controllerAction;

TwoFactorAuth/composer.json

@@ -12,7 +12,6 @@
         "magento/module-ui": "*",
         "magento/module-user": "*",
         "magento/module-integration": "*",
-        "magento/module-admin-adobe-ims": "*",
         "christian-riesen/base32": "^1.3",
         "spomky-labs/otphp": "^10.0",
         "endroid/qr-code": "^4.3.5",