fix dates in MFTF test; update admin user form plugin to set the user expiration value (#22833)

Author: lfolco

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

@@ -7,6 +7,8 @@
 
 namespace Magento\Security\Model\Plugin;
 
+use Magento\Security\Model\UserExpiration;
+
 /**
  * Add the `expires_at` form field to the User main form.
  *
@@ -20,14 +22,31 @@ class AdminUserForm
      */
     private $localeDate;
 
+    /**
+     * @var \Magento\Security\Model\ResourceModel\UserExpiration
+     */
+    private $userExpirationResource;
+
+    /**
+     * @var UserExpirationFactory
+     */
+    private $userExpirationFactory;
+
     /**
      * UserForm constructor.
      *
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param UserExpiration $userExpiration
+     * @param \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
      */
-    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
-    {
+    public function __construct(
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\Security\Model\UserExpirationFactory $userExpirationFactory,
+        \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
+    ) {
         $this->localeDate = $localeDate;
+        $this->userExpirationResource = $userExpirationResource;
+        $this->userExpirationFactory = $userExpirationFactory;
     }
 
     /**
@@ -51,6 +70,12 @@ public function aroundGetFormHtml(
                 \IntlDateFormatter::MEDIUM
             );
             $fieldset = $form->getElement('base_fieldset');
+            $userIdField = $fieldset->getElements()->searchById('user_id');
+            $userExpirationValue = null;
+            if ($userIdField) {
+                $userId = $userIdField->getValue();
+                $userExpirationValue = $this->loadUserExpirationByUserId($userId);
+            }
             $fieldset->addField(
                 'expires_at',
                 'date',
@@ -61,6 +86,7 @@ public function aroundGetFormHtml(
                     'date_format' => $dateFormat,
                     'time_format' => $timeFormat,
                     'class' => 'validate-date',
+                    'value' => $userExpirationValue,
                 ]
             );
 
@@ -69,4 +95,12 @@ public function aroundGetFormHtml(
 
         return $proceed();
     }
+
+    private function loadUserExpirationByUserId($userId)
+    {
+        /** @var \Magento\Security\Model\UserExpiration $userExpiration */
+        $userExpiration = $this->userExpirationFactory->create();
+        $this->userExpirationResource->load($userExpiration, $userId);
+        return $userExpiration->getExpiresAt();
+    }
 }

app/code/Magento/Security/Observer/AfterAdminUserLoad.php

@@ -16,6 +16,7 @@
             <testCaseId value="" />
             <severity value="CRITICAL"/>
             <group value="security"/>
+            <group value="debug"/>
         </annotations>
 
         <before>
@@ -26,7 +27,7 @@
         </after>
 
         <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
-        <generateDate date="-5 day" format="M d, Y h:i:s" stepKey="expiresDateTime"/>
+        <generateDate date="-5 day" format="M d, Y g:i:s A" stepKey="expiresDateTime"/>
         <actionGroup ref="AdminFillInUserWithExpirationActionGroup" stepKey="fillInNewUserWithValidExpiration">
             <argument name="expires_at" value="{$expiresDateTime}"/>
         </actionGroup>

app/code/Magento/Security/Test/Mftf/Test/AdminCreateNewUserWithInvalidExpirationTest.xml

@@ -16,6 +16,7 @@
             <testCaseId value="" />
             <severity value="CRITICAL"/>
             <group value="security"/>
+            <group value="debug"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -25,10 +26,21 @@
         </after>
 
         <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
-        <generateDate date="+5 day" format="M d, Y h:i:s" stepKey="expiresDateTime"/>
+        <generateDate date="+5 day" format="M d, Y g:i:s A" stepKey="expiresDateTime"/>
         <actionGroup ref="AdminFillInUserWithExpirationActionGroup" stepKey="fillInNewUserWithValidExpiration">
             <argument name="expires_at" value="{$expiresDateTime}"/>
         </actionGroup>
         <actionGroup ref="AdminSaveUserSuccessActionGroup" stepKey="saveNewUserWithValidExpirationSuccess" />
+
+        <actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
+            <argument name="user" value="NewAdminUser"/>
+        </actionGroup>
+
+        <seeInField userInput="{$expiresDateTime}" selector="input#user_expires_at" stepKey="verifyUserExpirationInField"/>
+
+        <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteUser">
+            <argument name="user" value="NewAdminUser"/>
+        </actionGroup>
+        <!-- TODO: delete created user -->
     </test>
 </tests>

app/code/Magento/Security/Test/Mftf/Test/AdminCreateNewUserWithValidExpirationTest.xml

@@ -25,7 +25,7 @@
         </before>
 
         <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
-        <generateDate date="+2 minute" format="M d, Y h:i A" stepKey="expiresDateTime"/>
+        <generateDate date="+2 minute" format="M d, Y g:i:s A" stepKey="expiresDateTime"/>
         <actionGroup ref="AdminFillInUserWithExpirationActionGroup" stepKey="fillInNewUserWithValidExpiration">
             <argument name="expires_at" value="{$expiresDateTime}"/>
         </actionGroup>

app/code/Magento/Security/Test/Mftf/Test/AdminLoginAdminUserWithInvalidExpiration.xml

@@ -18,6 +18,7 @@
             <testCaseId value=""/>
             <severity value="CRITICAL"/>
             <group value="security"/>
+            <group value="debug"/>
         </annotations>
 
         <before>
@@ -28,7 +29,7 @@
         </after>
 
         <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
-        <generateDate date="+5 day" format="M d, Y h:i:s" stepKey="expiresDateTime"/>
+        <generateDate date="+5 day" format="M d, Y g:i:s A" stepKey="expiresDateTime"/>
         <actionGroup ref="AdminFillInUserWithExpirationActionGroup" stepKey="fillInNewUserWithValidExpiration">
             <argument name="expires_at" value="{$expiresDateTime}"/>
         </actionGroup>

app/code/Magento/Security/Test/Mftf/Test/AdminLoginAdminUserWithValidExpiration.xml

@@ -10,9 +10,6 @@
     <event name="admin_user_save_after">
         <observer name="add_user_expiration" instance="Magento\Security\Observer\AfterAdminUserSave"/>
     </event>
-    <event name="admin_user_load_after">
-        <observer name="add_user_expiration" instance="Magento\Security\Observer\AfterAdminUserLoad"/>
-    </event>
     <event name="admin_user_authenticate_before">
         <observer name="check_user_expiration" instance="Magento\Security\Observer\AdminUserAuthenticateBefore"/>
     </event>