fix integration, unit tests (#22833: Short-term admin accounts)

Author: lfolco

app/code/Magento/Security/Model/Plugin/AdminUserForm.php

@@ -24,7 +24,7 @@ class AdminUserForm
     private $userExpirationResource;
 
     /**
-     * @var \Magento\Security\Model\UserExpirationFactory
+     * @var \Magento\Security\Model\UserExpirationInterfaceFactory
      */
     private $userExpirationFactory;
 

app/code/Magento/Security/Model/UserExpiration.php

@@ -7,8 +7,6 @@
 
 namespace Magento\Security\Model;
 
-use Magento\Security\Api\Data\UserExpirationInterface;
-
 /**
  * Admin User Expiration model.
  */

app/code/Magento/Security/Api/Data/UserExpirationInterface.php renamed to app/code/Magento/Security/Model/UserExpirationInterface.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Security\Api\Data;
+namespace Magento\Security\Model;
 
 /**
  * Interface UserExpirationInterface to be used as a DTO for expires_at property on User model.

app/code/Magento/Security/Model/UserExpirationManager.php

@@ -134,7 +134,7 @@ private function processExpiredUsers(ExpiredUsersCollection $expiredRecords): vo
     public function isUserExpired(string $userId): bool
     {
         $isExpired = false;
-        /** @var \Magento\Security\Model\UserExpiration $expiredRecord */
+        /** @var \Magento\Security\Model\UserExpirationInterface $expiredRecord */
         $expiredRecord = $this->userExpirationCollectionFactory->create()
             ->addExpiredRecordsForUserFilter($userId)
             ->getFirstItem();

app/code/Magento/Security/Test/Unit/Observer/AdminUserAuthenticateBeforeTest.php

@@ -48,7 +48,7 @@ class AdminUserAuthenticateBeforeTest extends \PHPUnit\Framework\TestCase
     private $eventMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Security\Model\UserExpiration
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Security\Model\UserExpirationInterface
      */
     private $userExpirationMock;
 
@@ -77,8 +77,8 @@ protected function setUp()
         $this->eventObserverMock = $this->createPartialMock(\Magento\Framework\Event\Observer::class, ['getEvent']);
         $this->eventMock = $this->createPartialMock(\Magento\Framework\Event::class, ['getUsername']);
         $this->userExpirationMock = $this->createPartialMock(
-            \Magento\Security\Model\UserExpiration::class,
-            ['getId', 'getExpiresAt', 'setId', 'setExpiresAt']
+            \Magento\Security\Model\UserExpirationInterface::class,
+            ['getUserId', 'getExpiresAt', 'setUserId', 'setExpiresAt']
         );
     }
 

app/code/Magento/Security/etc/di.xml

@@ -18,5 +18,5 @@
             </argument>
         </arguments>
     </type>
-    <preference for="Magento\Security\Api\Data\UserExpirationInterface" type="Magento\Security\Model\UserExpiration"/>
+    <preference for="Magento\Security\Model\UserExpirationInterface" type="Magento\Security\Model\UserExpiration"/>
 </config>

dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php

@@ -159,8 +159,9 @@ public function testProcessProlongWithExpiredUser()
         /** @var \Magento\User\Model\User $user */
         $user = $this->objectManager->create(\Magento\User\Model\User::class);
         $user->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
-        $userExpirationFactory = $this->objectManager->create(\Magento\Security\Model\UserExpirationFactory::class);
-        /** @var \Magento\Security\Model\UserExpiration $userExpiration */
+        $userExpirationFactory =
+            $this->objectManager->create(\Magento\Security\Model\UserExpirationInterfaceFactory::class);
+        /** @var \Magento\Security\Model\UserExpirationInterface $userExpiration */
         $userExpiration = $userExpirationFactory->create();
         $userExpiration->setId($user->getId())
             ->setExpiresAt($expireDate->format('Y-m-d H:i:s'))

dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpiration/CollectionTest.php

@@ -9,7 +9,7 @@
 namespace Magento\Security\Model\ResourceModel\UserExpiration;
 
 /**
- * Class CollectionTest
+ * Test UserExpiration collection filters.
  */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {

dev/tests/integration/testsuite/Magento/Security/Model/UserExpirationManagerTest.php

@@ -156,8 +156,8 @@ private function expireUser(\Magento\User\Model\User $user)
     {
         $expireDate = new \DateTime();
         $expireDate->modify('-10 days');
-        /** @var \Magento\Security\Model\UserExpiration $userExpiration */
-        $userExpiration = $this->objectManager->create(\Magento\Security\Model\UserExpiration::class);
+        /** @var \Magento\Security\Model\UserExpirationInterface $userExpiration */
+        $userExpiration = $this->objectManager->create(\Magento\Security\Model\UserExpirationInterface::class);
         $userExpiration->setId($user->getId())
             ->setExpiresAt($expireDate->format('Y-m-d H:i:s'))
             ->save();