Merge remote-tracking branch 'tsg/MC-18753' into borg-2.3.4

Author: nathanjosiah

app/code/Magento/User/Controller/Adminhtml/User/Delete.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,10 +8,16 @@
 
 use Magento\User\Block\User\Edit\Tab\Main as UserEdit;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
-class Delete extends \Magento\User\Controller\Adminhtml\User
+/**
+ * Delete admin user.
+ */
+class Delete extends \Magento\User\Controller\Adminhtml\User implements HttpPostActionInterface
 {
     /**
+     * Execute delete action.
+     *
      * @return void
      */
     public function execute()
@@ -37,7 +42,7 @@ public function execute()
                 $currentUser->performIdentityCheck($currentUserPassword);
                 /** @var \Magento\User\Model\User $model */
                 $model = $this->_userFactory->create();
-                $model->setId($userId);
+                $model->load($userId);
                 $model->delete();
                 $this->messageManager->addSuccess(__('You deleted the user.'));
                 $this->_redirect('adminhtml/*/');

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

@@ -253,6 +253,7 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
      */
     public function delete(\Magento\Framework\Model\AbstractModel $user)
     {
+        $user->beforeDelete();
         $this->_beforeDelete($user);
         $connection = $this->getConnection();
 
@@ -268,7 +269,9 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
             $connection->rollBack();
             return false;
         }
+        $user->afterDelete();
         $connection->commit();
+        $user->afterDeleteCommit();
         $this->_afterDelete($user);
         return true;
     }

app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php

@@ -81,7 +81,7 @@ protected function setUp()
 
         $this->userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getId', 'performIdentityCheck', 'delete'])
+            ->setMethods(['getId', 'performIdentityCheck', 'delete', 'load'])
             ->getMock();
 
         $this->userFactoryMock = $this->getMockBuilder(\Magento\User\Model\UserFactory::class)
@@ -134,15 +134,18 @@ public function testExecute($currentUserPassword, $userId, $currentUserId, $resu
 
         $this->requestMock->expects($this->any())
             ->method('getPost')
-            ->willReturnMap([
-                ['user_id', $userId],
-                [\Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD, $currentUserPassword],
-            ]);
+            ->willReturnMap(
+                [
+                    ['user_id', $userId],
+                    [\Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD, $currentUserPassword],
+                ]
+            );
 
         $userMock = clone $currentUserMock;
 
         $this->userFactoryMock->expects($this->any())->method('create')->will($this->returnValue($userMock));
         $this->responseMock->expects($this->any())->method('setRedirect')->willReturnSelf();
+        $this->userMock->expects($this->any())->method('load')->with($userId)->willReturn($this->userFactoryMock);
         $this->userMock->expects($this->any())->method('delete')->willReturnSelf();
         $this->messageManagerMock->expects($this->once())->method($resultMethod);
 
@@ -172,10 +175,12 @@ public function testEmptyPassword()
 
         $this->requestMock->expects($this->any())
             ->method('getPost')
-            ->willReturnMap([
-                ['user_id', $userId],
-                [\Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD, ''],
-            ]);
+            ->willReturnMap(
+                [
+                    ['user_id', $userId],
+                    [\Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD, ''],
+                ]
+            );
 
         $result = $this->controller->execute();
         $this->assertNull($result);
@@ -191,8 +196,8 @@ public function executeDataProvider()
         return [
             [
                 'currentUserPassword' => '123123q',
-                'userId'              => 1,
-                'currentUserId'       => 2,
+                'userId'              => 2,
+                'currentUserId'       => 1,
                 'resultMethod'        => 'addSuccess',
             ],
             [

dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/DeleteTest.php

@@ -22,6 +22,7 @@ public function testDeleteActionWithError()
         $messageManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Framework\Message\ManagerInterface::class);
         $user->load(1);
+        $this->getRequest()->setMethod('POST');
         $this->getRequest()->setPostValue('user_id', $user->getId() . '_suffix_ignored_in_mysql_casting_to_int');
 
         $this->dispatch('backend/admin/user/delete');