Fix admin user save

Author: ronangr1

Model/Admin/User/Save.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © OpenGento, All rights reserved.
+ * See LICENSE bundled with this library for license details.
+ */
+declare(strict_types=1);
+
+namespace Opengento\Hoodoor\Model\Admin\User;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\State\UserLockedException;
+use Magento\Security\Model\SecurityCookie;
+use Magento\User\Controller\Adminhtml\User\Save as CoreSave;
+use Magento\User\Model\Spi\NotificationExceptionInterface;
+use Magento\User\Model\User;
+
+class Save extends CoreSave
+{
+    private const XML_PATH_ENABLE_ADMIN = 'hoodoor/general/enable_admin';
+
+    private $securityCookie;
+
+    public function __construct(
+        private readonly ScopeConfigInterface $scopeConfig,
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\User\Model\UserFactory $userFactory
+    )
+    {
+        parent::__construct($context, $coreRegistry, $userFactory);
+    }
+
+    public function execute(): void
+    {
+        if(!$this->isEnabled()) {
+            parent::execute();
+            return;
+        }
+
+        $userId = (int)$this->getRequest()->getParam('user_id');
+        $data = $this->getRequest()->getPostValue();
+        if (array_key_exists('form_key', $data)) {
+            unset($data['form_key']);
+        }
+        if (!$data) {
+            $this->_redirect('adminhtml/*/');
+            return;
+        }
+
+        $model = $this->_userFactory->create()->load($userId);
+        if ($userId && $model->isObjectNew()) {
+            $this->messageManager->addError(__('This user no longer exists.'));
+            $this->_redirect('adminhtml/*/');
+            return;
+        }
+        $model->setData($this->_getAdminUserData($data));
+        $userRoles = $this->getRequest()->getParam('roles', []);
+        if (count($userRoles)) {
+            $model->setRoleId($userRoles[0]);
+        }
+
+        /** @var $currentUser User */
+        $currentUser = $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->getUser();
+        if ($userId == $currentUser->getId()
+            && $this->_objectManager->get(\Magento\Framework\Validator\Locale::class)
+                ->isValid($data['interface_locale'])
+        ) {
+            $this->_objectManager->get(
+                \Magento\Backend\Model\Locale\Manager::class
+            )->switchBackendInterfaceLocale(
+                $data['interface_locale']
+            );
+        }
+
+        try {
+            $model->save();
+            $this->messageManager->addSuccess(__('You saved the user.'));
+            $this->_getSession()->setUserData(false);
+            $this->_redirect('adminhtml/*/');
+
+            $model->sendNotificationEmailsIfRequired();
+        } catch (UserLockedException $e) {
+            $this->_auth->logout();
+            $this->getSecurityCookie()->setLogoutReasonCookie(
+                \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
+            );
+            $this->_redirect('*');
+        } catch (NotificationExceptionInterface $exception) {
+            $this->messageManager->addErrorMessage($exception->getMessage());
+        } catch (\Magento\Framework\Validator\Exception $e) {
+            $messages = $e->getMessages();
+            $this->messageManager->addMessages($messages);
+            $this->redirectToEdit($model, $data);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            if ($e->getMessage()) {
+                $this->messageManager->addError($e->getMessage());
+            }
+            $this->redirectToEdit($model, $data);
+        }
+    }
+
+    private function getSecurityCookie()
+    {
+        if (!($this->securityCookie instanceof SecurityCookie)) {
+            return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
+        } else {
+            return $this->securityCookie;
+        }
+    }
+
+    private function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLE_ADMIN);
+    }
+}

etc/di.xml

@@ -21,6 +21,7 @@
                 type="Opengento\Hoodoor\Controller\Account\Edit" />
     <preference for="Magento\AdminAdobeIms\Plugin\PerformIdentityCheckMessagePlugin"
                 type="Opengento\Hoodoor\Plugin\AdobeImsReAuth\PerformIdentityCheckMessagePlugin"/>
+    <preference for="Magento\User\Controller\Adminhtml\User\Save" type="Opengento\Hoodoor\Model\Admin\User\Save"/>
     <type name="Magento\Webapi\Controller\Rest">
         <plugin name="hoodoor_disable_customer_webapi" type="Opengento\Hoodoor\Plugin\Webapi\Controller\Rest\DisableApi" />
     </type>

etc/module.xml

@@ -10,6 +10,8 @@
     <module name="Opengento_Hoodoor">
         <sequence>
             <module name="Magento_Customer"/>
+            <module name="Magento_Backend"/>
+            <module name="Magento_User"/>
         </sequence>
     </module>
 </config>