AC-10982::[2FA] Integrate with Duo Web SDK to support Universal Prompt-unit tests fixes

Author: glo05363

TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php

@@ -159,7 +159,10 @@ public function getApiHostname(): string
      */
     private function getClientSecret(): string
     {
-        return $this->encryptor->decrypt($this->scopeConfig->getValue(static::XML_PATH_CLIENT_SECRET));
+        // return default value if client secret is not set as per Duo Library
+        return $this->encryptor->decrypt(
+            $this->scopeConfig->getValue(static::XML_PATH_CLIENT_SECRET)
+        ) ?: 'abcdefghijklmnopqrstuvwxyz0123456789abcd';
     }
 
     /**
@@ -169,7 +172,8 @@ private function getClientSecret(): string
      */
     private function getClientId(): string
     {
-        return $this->scopeConfig->getValue(static::XML_PATH_CLIENT_ID);
+        // return default value if client id is not set as per Duo Library
+        return $this->scopeConfig->getValue(static::XML_PATH_CLIENT_ID) ?: 'ABCDEFGHIJKLMNOPQRST';
     }
 
     /**

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

@@ -85,33 +85,38 @@ public static function getIsEnabledTestDataSet(): array
     {
         return [
             [
-                'value',
-                'value',
-                'value',
+                'test.duosecurity.com',
+                'ABCDEFGHIJKLMNOPQRST',
+                'abcdefghijklmnopqrstuvwxyz0123456789abcd',
+                '0:3:pE7QRAv43bvos7oeve+ULjQ1QCoZw0NMXXtHZtYdmlBR4Nb18IpauosSz1jKFYjo1nPCsOwHk1mOlFpGObrzpSb3zF0=',
                 true
             ],
             [
                 null,
                 null,
                 null,
+                null,
                 false
             ],
             [
-                'value',
+                'test.duosecurity.com',
+                null,
                 null,
                 null,
                 false
             ],
             [
                 null,
-                'value',
+                'ABCDEFGHIJKLMNOPQRST',
+                null,
                 null,
                 false
             ],
             [
                 null,
                 null,
-                'value',
+                'abcdefghijklmnopqrstuvwxyz0123456789abcd',
+                '0:3:pE7QRAv43bvos7oeve+ULjQ1QCoZw0NMXXtHZtYdmlBR4Nb18IpauosSz1jKFYjo1nPCsOwHk1mOlFpGObrzpSb3zF0=',
                 false
             ]
         ];
@@ -130,17 +135,24 @@ public static function getIsEnabledTestDataSet(): array
     public function testIsEnabled(
         ?string $apiHostname,
         ?string $clientId,
-        ?string $clientSecret,
+        ?string $encryptedClientSecret,
+        ?string $decryptedClientSecret,
         bool $expected
     ): void {
         $this->configMock->method('getValue')->willReturnMap(
             [
                 [DuoSecurity::XML_PATH_API_HOSTNAME, 'default', null, $apiHostname],
                 [DuoSecurity::XML_PATH_CLIENT_ID, 'default', null, $clientId],
-                [DuoSecurity::XML_PATH_CLIENT_SECRET, 'default', null, $clientSecret]
+                [DuoSecurity::XML_PATH_CLIENT_SECRET, 'default', null, $encryptedClientSecret]
             ]
         );
 
+        // Mocking EncryptorInterface
+        $this->encryptorMock->expects($this->any())
+            ->method('decrypt')
+            ->with($encryptedClientSecret)
+            ->willReturn($decryptedClientSecret);
+
         $this->assertEquals($expected, $this->model->isEnabled());
     }
 

TwoFactorAuth/etc/config.xml

@@ -19,6 +19,8 @@
                 <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
             </authy>
             <duo>
+                <client_id>ABCDEFGHIJKLMNOPQRST</client_id>
+                <client_secret backend_model="Magento\Config\Model\Config\Backend\Encrypted">abcdefghijklmnopqrstuvwxyz0123456789abcd</client_secret>
                 <secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
             </duo>
             <google>