ACP2E-2755: Issue with rest api after enable 2FA Duo

Author: o-iegorov

TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php

@@ -78,20 +78,20 @@ class DuoSecurity implements EngineInterface
     private $scopeConfig;
 
     /**
-     * @var bool
+     * @var string
      */
-    private $forceUseDuoAuth;
+    private $duoSignaturePrefix;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param bool $forceUseDuoAuth
+     * @param string $duoSignaturePrefix
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
-        bool $forceUseDuoAuth = false
+        string $duoSignaturePrefix = self::AUTH_PREFIX
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->forceUseDuoAuth = $forceUseDuoAuth;
+        $this->duoSignaturePrefix = $duoSignaturePrefix;
     }
 
     /**
@@ -216,7 +216,7 @@ public function getRequestSignature(UserInterface $user): string
         $duoSignature = $this->signValues(
             $this->getSecretKey(),
             $values,
-            $this->getPrefix(),
+            $this->duoSignaturePrefix,
             static::DUO_EXPIRE,
             $time
         );
@@ -231,16 +231,6 @@ public function getRequestSignature(UserInterface $user): string
         return $duoSignature . ':' . $appSignature;
     }
 
-    /**
-     * Return prefix to use in the signature
-     *
-     * @return string
-     */
-    private function getPrefix() : string
-    {
-        return ($this->forceUseDuoAuth) ? static::DUO_PREFIX : static::AUTH_PREFIX;
-    }
-
     /**
      * @inheritDoc
      */

TwoFactorAuth/Test/Unit/Model/Provider/Engine/DuoSecurityTest.php

@@ -47,7 +47,7 @@ protected function setUp(): void
         $this->user = $this->getMockBuilder(UserInterface::class)->disableOriginalConstructor()->getMock();
 
         $this->model = $objectManager->getObject(DuoSecurity::class, ['scopeConfig' => $this->configMock]);
-        $this->modelWithForcedDuoAuth = new DuoSecurity($this->configMock, true);
+        $this->modelWithForcedDuoAuth = new DuoSecurity($this->configMock, $this->model::DUO_PREFIX);
     }
 
     /**

TwoFactorAuth/etc/adminhtml/di.xml

@@ -23,7 +23,7 @@
     </type>
     <type name="Magento\TwoFactorAuth\Model\Provider\Engine\DuoSecurity">
         <arguments>
-            <argument name="forceUseDuoAuth" xsi:type="boolean">true</argument>
+            <argument name="duoSignaturePrefix" xsi:type="const">Magento\TwoFactorAuth\Model\Provider\Engine\DuoSecurity::DUO_PREFIX</argument>
         </arguments>
     </type>
 </config>