ACP2E-3509: Admin Actions Log User Report doesnt show details for adminhtml_user_delete

Author: glanujnehra

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

@@ -1,18 +1,21 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\User\Controller\Adminhtml\User;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\User\Block\User\Edit\Tab\Main as UserEdit;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\User\Controller\Adminhtml\User;
 
-class Delete extends \Magento\User\Controller\Adminhtml\User
+class Delete extends User implements HttpPostActionInterface
 {
     /**
+     * Execute
+     *
      * @return void
      */
     public function execute()
@@ -38,7 +41,12 @@ public function execute()
                 /** @var \Magento\User\Model\User $model */
                 $model = $this->_userFactory->create();
                 $model->setId($userId);
+                $deletedUser = $this->_userFactory->create()->load($userId);
                 $model->delete();
+                $this->_eventManager->dispatch('log_user_after_delete', [
+                    'deletedUser' => $deletedUser,
+                    'model' => $model,
+                ]);
                 $this->messageManager->addSuccess(__('You deleted the user.'));
                 $this->_redirect('adminhtml/*/');
                 return;

app/code/Magento/User/Observer/ValidateModelDeleteAfter.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\User\Observer;
+
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\User\Model\User;
+
+/**
+ * Class used to log details of user deletions in action reports.
+ */
+class ValidateModelDeleteAfter implements ObserverInterface
+{
+    /**
+     * @var ManagerInterface
+     */
+    private $_eventManager;
+
+    /**
+     * Constructor
+     *
+     * @param ManagerInterface $eventManager
+     */
+    public function __construct(
+        ManagerInterface $eventManager
+    ) {
+        $this->_eventManager = $eventManager;
+    }
+
+    /**
+     * Execute observer
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer): void
+    {
+        /** @var User $deletedUser */
+        $deletedUser = $observer->getEvent()->getData('deletedUser');
+        /** @var User $model */
+        $model = $observer->getEvent()->getData('model');
+        if ($deletedUser && $model) {
+            $model->setData($deletedUser->getData());
+            if ($model->getOrigData() === null) {
+                foreach ($model->getData() as $key => $val) {
+                    $model->setOrigData($key, $val);
+                }
+            }
+            $this->_eventManager->dispatch('model_delete_after', ['object' => $model]);
+        }
+    }
+}

app/code/Magento/User/Test/Unit/Observer/ValidateModelDeleteAfterTest.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\User\Test\Unit\Observer;
+
+use Magento\Framework\Event;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Event\Observer;
+use Magento\User\Observer\ValidateModelDeleteAfter;
+use Magento\User\Model\User;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class ValidateModelDeleteAfterTest extends TestCase
+{
+    /** @var ValidateModelDeleteAfter */
+    private $observer;
+
+    /** @var ManagerInterface|MockObject */
+    private $eventManagerMock;
+
+    protected function setUp(): void
+    {
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+        $this->observer = new ValidateModelDeleteAfter($this->eventManagerMock);
+    }
+
+    public function testExecute()
+    {
+        $deletedUser = $this->createMock(User::class);
+        $userModel = $this->createMock(User::class);
+        $deletedUser->method('getData')->willReturn(['key' => 'value']);
+        $observerData = [
+            'deletedUser' => $deletedUser,
+            'model' => $userModel,
+        ];
+        $eventMock = $this->createMock(Event::class);
+        $eventMock->method('getData')->willReturnCallback(function ($key) use ($observerData) {
+            return $observerData[$key] ?? null;
+        });
+        $observer = $this->createMock(Observer::class);
+        $observer->method('getEvent')->willReturn($eventMock);
+        $userModel->expects($this->once())
+            ->method('setData')
+            ->with(['key' => 'value'])
+            ->willReturnSelf();
+        $userModel->method('getData')->willReturn(['key' => 'value']);
+        $userModel->expects($this->once())
+            ->method('getOrigData')
+            ->willReturn(null);
+        $userModel->expects($this->once())
+            ->method('setOrigData')
+            ->with('key', 'value')
+            ->willReturnSelf();
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('model_delete_after', ['object' => $userModel]);
+        $this->observer->execute($observer);
+    }
+}

app/code/Magento/User/etc/adminhtml/events.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
@@ -15,4 +15,7 @@
     <event name="admin_user_save_after">
         <observer name="magento_user" instance="Magento\User\Observer\Backend\TrackAdminNewPasswordObserver" />
     </event>
+    <event name="log_user_after_delete">
+        <observer name="magento_user" instance="Magento\User\Observer\ValidateModelDeleteAfter" />
+    </event>
 </config>

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\User\Controller\Adminhtml\User;
 
@@ -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');