cia-2.4.8-beta2-develop-2.4-develop-sync-01132025: resolve conflict

Author: pawan-adobe-security

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

@@ -1,54 +1,61 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\TwoFactorAuth\Test\Unit\Model\Provider\Engine;
 
-use Magento\User\Api\Data\UserInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\UrlInterface;
 use Magento\TwoFactorAuth\Model\Provider\Engine\DuoSecurity;
+use Magento\User\Api\Data\UserInterface;
+use Duo\DuoUniversal\Client;
+use DuoAPI\Auth as DuoAuth;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DuoSecurityTest extends TestCase
 {
-    /**
-     * @var DuoSecurity
-     */
-    private $model;
+    /** @var MockObject|ScopeConfigInterface */
+    private $configMock;
 
-    /**
-     * @var DuoSecurity
-     */
-    private $modelWithForcedDuoAuth;
+    /** @var MockObject|UrlInterface */
+    private $urlMock;
 
-    /**
-     * @var ScopeConfigInterface|MockObject
-     */
-    private $configMock;
+    /** @var MockObject|Client */
+    private $clientMock;
 
     /**
-     * @var UserInterface|MockObject
+     * @var DuoAuth|MockObject
      */
-    private $user;
+    private $duoAuthMock;
+
+    /** @var DuoSecurity */
+    private $model;
 
-    /**
-     * @inheritDoc
-     */
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
-        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)->disableOriginalConstructor()->getMock();
-        $this->user = $this->getMockBuilder(UserInterface::class)->disableOriginalConstructor()->getMock();
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->model = $objectManager->getObject(DuoSecurity::class, ['scopeConfig' => $this->configMock]);
-        $this->modelWithForcedDuoAuth = new DuoSecurity($this->configMock, $this->model::DUO_PREFIX);
+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->clientMock = $this->createMock(Client::class);
+        $this->duoAuthMock = $this->createMock(DuoAuth::class);
+
+        $this->model = new DuoSecurity(
+            $this->configMock,
+            $this->urlMock,
+            $this->clientMock,
+            $this->duoAuthMock
+        );
     }
 
     /**
@@ -60,46 +67,11 @@ public static function getIsEnabledTestDataSet(): array
     {
         return [
             [
-                'value',
-                'value',
-                'value',
-                'value',
+                'test.duosecurity.com',
+                'ABCDEFGHIJKLMNOPQRST',
+                'abcdefghijklmnopqrstuvwxyz0123456789abcd',
+                'google,duo_security,authy',
                 true
-            ],
-            [
-                null,
-                null,
-                null,
-                null,
-                false
-            ],
-            [
-                'value',
-                null,
-                null,
-                null,
-                false
-            ],
-            [
-                null,
-                'value',
-                null,
-                null,
-                false
-            ],
-            [
-                null,
-                null,
-                'value',
-                null,
-                false
-            ],
-            [
-                null,
-                null,
-                null,
-                'value',
-                false
             ]
         ];
     }
@@ -108,51 +80,28 @@ public static function getIsEnabledTestDataSet(): array
      * Check that the provider is available based on configuration.
      *
      * @param string|null $apiHostname
-     * @param string|null $appKey
-     * @param string|null $secretKey
-     * @param string|null $integrationKey
+     * @param string|null $clientId
+     * @param string|null $clientSecret
      * @param bool $expected
      * @return void
      * @dataProvider getIsEnabledTestDataSet
      */
     public function testIsEnabled(
         ?string $apiHostname,
-        ?string $appKey,
-        ?string $secretKey,
-        ?string $integrationKey,
+        ?string $clientId,
+        ?string $clientSecret,
+        string $forceProviders,
         bool $expected
     ): void {
         $this->configMock->method('getValue')->willReturnMap(
             [
                 [DuoSecurity::XML_PATH_API_HOSTNAME, 'default', null, $apiHostname],
-                [DuoSecurity::XML_PATH_APPLICATION_KEY, 'default', null, $appKey],
-                [DuoSecurity::XML_PATH_SECRET_KEY, 'default', null, $secretKey],
-                [DuoSecurity::XML_PATH_INTEGRATION_KEY, 'default', null, $integrationKey]
+                [DuoSecurity::XML_PATH_CLIENT_ID, 'default', null, $clientId],
+                [DuoSecurity::XML_PATH_CLIENT_SECRET, 'default', null, $clientSecret],
+                ['twofactorauth/general/force_providers', 'default', null, $forceProviders]
             ]
         );
 
         $this->assertEquals($expected, $this->model->isEnabled());
     }
-
-    public function testGetRequestSignature() : void
-    {
-        $this->user->expects($this->any())
-            ->method('getUserName')
-            ->willReturn('admin');
-        $this->configMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn('SECRET');
-
-        $this->assertStringContainsString($this->model::AUTH_PREFIX, $this->model->getRequestSignature($this->user));
-        $this->assertStringNotContainsString($this->model::DUO_PREFIX, $this->model->getRequestSignature($this->user));
-
-        $this->assertStringContainsString(
-            $this->model::DUO_PREFIX,
-            $this->modelWithForcedDuoAuth->getRequestSignature($this->user)
-        );
-        $this->assertStringNotContainsString(
-            $this->model::AUTH_PREFIX,
-            $this->modelWithForcedDuoAuth->getRequestSignature($this->user)
-        );
-    }
 }