add cronjob, finish tests (#22833)

app/code/Magento/User/Cron/DisableExpiredUsers.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Cron;
+
+/**
+ * Disable expired users.
+ */
+class DisableExpiredUsers
+{
+
+    /**
+     * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        \Magento\User\Model\ResourceModel\User\CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Disable all expired user accounts.
+     */
+    public function execute()
+    {
+        $users = $this->collectionFactory->create()
+            ->addExpiresAtFilter()
+            ->addFieldToFilter('is_active', 1)
+        ;
+        /** @var \Magento\User\Model\User $user */
+        foreach ($users as $user) {
+            $user->setIsActive(0)
+                ->setExpiresAt(null)
+                ->save();
+        }
+    }
+}

app/code/Magento/User/Model/ResourceModel/User/Collection.php

@@ -13,9 +13,9 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+
     /**
      * Define resource model
-     *
      * @return void
      */
     protected function _construct()
@@ -41,4 +41,21 @@ protected function _initSelect()
             ['role_name']
         );
     }
+
+    /**
+     * Filter users by expires_at.
+     * @param string|null $now
+     * @return $this
+     */
+    public function addExpiresAtFilter($now = null)
+    {
+        if ($now === null) {
+            $now = new \DateTime();
+            $now->format('Y-m-d H:i:s');
+        }
+
+        $this->addFieldToFilter('expires_at', ['lt' => $now]);
+
+        return $this;
+    }
 }

app/code/Magento/User/Test/Unit/Model/UserValidationRulesTest.php

@@ -45,7 +45,7 @@ public function testAddPasswordConfirmationRule()
 
     public function testAddExpiresAtRule()
     {
-        $this->validator->expects($this->once())->method('addRule')->willReturn($this->validator);
+        $this->validator->expects($this->atMost(2))->method('addRule')->willReturn($this->validator);
         $this->assertSame($this->validator, $this->rules->addExpiresAtRule($this->validator));
     }
 }

app/code/Magento/User/etc/crontab.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+
+    <group id="default">
+        <job name="user_expire_users" instance="Magento\User\Cron\DisableExpiredUsers" method="execute">
+            <schedule>0 * * * *</schedule>
+        </job>
+    </group>
+
+</config>

dev/tests/integration/testsuite/Magento/User/Cron/DisableExpiredUsersTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Cron;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class DisableExpiredUsersTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/User/_files/expired_users.php
+     */
+    public function testExecute()
+    {
+        /** @var \Magento\User\Cron\DisableExpiredUsers $job */
+        $job = Bootstrap::getObjectManager()->create(\Magento\User\Cron\DisableExpiredUsers::class);
+        $job->execute();
+
+        /** @var \Magento\User\Model\User $user */
+        $user = Bootstrap::getObjectManager()->create(\Magento\User\Model\User::class);
+        $user->loadByUsername('adminUser3');
+        static::assertEquals(0, $user->getIsActive());
+        static::assertNull($user->getExpiresAt());
+    }
+
+}

dev/tests/integration/testsuite/Magento/User/Model/ResourceModel/User/CollectionTest.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Model\ResourceModel\User;
+
+/**
+ * User collection test
+ * @magentoAppArea adminhtml
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\User\Model\ResourceModel\User\Collection
+     */
+    protected $collection;
+
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\User\Model\ResourceModel\User\Collection::class
+        );
+    }
+
+    public function testSelectQueryInitialized()
+    {
+        static::assertContains(
+            'main_table.user_id = user_role.user_id AND user_role.parent_id != 0',
+            $this->collection->getSelect()->__toString()
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/User/_files/expired_users.php
+     */
+    public function testExpiresAtFilter()
+    {
+        $this->collection->addExpiresAtFilter();
+        static::assertCount(1, $this->collection);
+    }
+}

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -387,6 +387,17 @@ public function testBeforeSavePasswordTooShort()
         $this->_model->save();
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage The expiration date must be later than the current date.
+     * @magentoDbIsolation enabled
+     */
+    public function testBeforeSaveExpireDateBeforeNow()
+    {
+        $this->_model->setExpiresAt('2010-01-01 00:00:00');
+        $this->_model->save();
+    }
+
     /**
      * @dataProvider beforeSavePasswordInsecureDataProvider
      * @expectedException \Magento\Framework\Exception\LocalizedException

dev/tests/integration/testsuite/Magento/User/_files/expired_users.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * Create an admin user with expired access date
+ */
+$userIds = [];
+
+/** @var $model \Magento\User\Model\User */
+$model = $objectManager->create(\Magento\User\Model\User::class);
+$model->setFirstname("John")
+    ->setLastname("Doe")
+    ->setUsername('adminUser3')
+    ->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD)
+    ->setEmail('[email protected]')
+    ->setRoleType('G')
+    ->setResourceId('Magento_Adminhtml::all')
+    ->setPrivileges("")
+    ->setAssertId(0)
+    ->setRoleId(1)
+    ->setPermission('allow');
+$model->save();
+$userIds[] = $model->getDataByKey('user_id');
+
+/** @var $model \Magento\User\Model\User */
+$futureDate = new \DateTime();
+$futureDate->modify('+10 days');
+$model = $objectManager->create(\Magento\User\Model\User::class);
+$model->setFirstname("John")
+    ->setLastname("Doe")
+    ->setUsername('adminUser4')
+    ->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD)
+    ->setEmail('[email protected]')
+    ->setExpiresAt($futureDate->format('Y-m-d H:i:s'))
+    ->setRoleType('G')
+    ->setResourceId('Magento_Adminhtml::all')
+    ->setPrivileges("")
+    ->setAssertId(0)
+    ->setRoleId(1)
+    ->setPermission('allow');
+$model->save();
+$userIds[] = $model->getDataByKey('user_id');
+
+// need to bypass model validation to set expired date
+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+$conn = $resource->getConnection(\Magento\Framework\App\ResourceConnection::DEFAULT_CONNECTION);
+$tableName = $resource->getTableName('admin_user');
+$sql = "UPDATE " . $tableName . " SET expires_at = '2010-01-01 00:00:00' WHERE user_id=" .
+    $userIds[0] . ";";
+$result = $conn->query($sql);
+
+