Merge pull request #74 from magento-performance/ims-phase1

Ims phase1

Author: andimov

TwoFactorAuth/Observer/ControllerActionPredispatch.php

@@ -22,6 +22,7 @@
 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
@@ -75,6 +76,11 @@ class ControllerActionPredispatch implements ObserverInterface
      */
     private $userContext;
 
+    /**
+     * @var ImsConfig
+     */
+    private ImsConfig $adminAdobeImsConfig;
+
     /**
      * @param TfaInterface $tfa
      * @param TfaSessionInterface $tfaSession
@@ -84,6 +90,7 @@ class ControllerActionPredispatch implements ObserverInterface
      * @param UrlInterface $url
      * @param AuthorizationInterface $authorization
      * @param UserContextInterface $userContext
+     * @param ImsConfig $adminAdobeImsConfig
      */
     public function __construct(
         TfaInterface $tfa,
@@ -93,7 +100,8 @@ public function __construct(
         ActionFlag $actionFlag,
         UrlInterface $url,
         AuthorizationInterface $authorization,
-        UserContextInterface $userContext
+        UserContextInterface $userContext,
+        ImsConfig $adminAdobeImsConfig
     ) {
         $this->tfa = $tfa;
         $this->tfaSession = $tfaSession;
@@ -103,6 +111,7 @@ public function __construct(
         $this->url = $url;
         $this->authorization = $authorization;
         $this->userContext = $userContext;
+        $this->adminAdobeImsConfig = $adminAdobeImsConfig;
     }
 
     /**
@@ -119,9 +128,13 @@ private function redirect(string $url): void
 
     /**
      * @inheritDoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     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,6 +12,7 @@
         "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",