changes as per comments on GitHub

Author: AnshuMishra17

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

@@ -7,11 +7,9 @@
 namespace Magento\User\Controller\Adminhtml;
 
 use Magento\Framework\Encryption\Helper\Security;
-use Magento\Framework\App\ObjectManager;
 use Magento\Backend\App\AbstractAction;
 use Magento\Backend\App\Action\Context;
 use Magento\User\Model\UserFactory;
-use Magento\Backend\Helper\Data;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -25,27 +23,19 @@ abstract class Auth extends AbstractAction
      * @var UserFactory
      */
     protected $_userFactory;
-    
-    /**
-     * @var Data
-     */
-    protected $_backendDataHelper;
 
     /**
      * Construct
      *
      * @param Context $context
      * @param UserFactory $userFactory
-     * @param Data $backendDataHelper
      */
     public function __construct(
         Context $context,
-        UserFactory $userFactory,
-        Data $backendDataHelper = null
+        UserFactory $userFactory
     ) {
         parent::__construct($context);
         $this->_userFactory = $userFactory;
-        $this->_backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class);
     }
 
     /**

app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php

@@ -15,21 +15,27 @@
 use Magento\Security\Model\PasswordResetRequestEvent;
 use Magento\Framework\Exception\SecurityViolationException;
 use Magento\User\Controller\Adminhtml\Auth;
+use Magento\Backend\Helper\Data;
 
 class Forgotpassword extends Auth
 {
     /**
      * @var SecurityManager
      */
     protected $securityManager;
-    
+
     /**
      * User model factory
      *
      * @var CollectionFactory
      */
     private $userCollectionFactory;
 
+    /**
+     * @var Data
+     */
+    private $backendDataHelper;
+
     /**
      * @param Context $context
      * @param UserFactory $userFactory
@@ -40,12 +46,15 @@ public function __construct(
         Context $context,
         UserFactory $userFactory,
         SecurityManager $securityManager,
-        CollectionFactory $userCollectionFactory = null
+        CollectionFactory $userCollectionFactory = null,
+        Data $backendDataHelper = null
     ) {
         parent::__construct($context, $userFactory);
         $this->securityManager = $securityManager;
         $this->userCollectionFactory = $userCollectionFactory ?:
                 ObjectManager::getInstance()->get(CollectionFactory::class);
+        $this->backendDataHelper = $backendDataHelper ?:
+                ObjectManager::getInstance()->get(Data::class);
     }
 
     /**
@@ -84,7 +93,7 @@ public function execute()
                             /** @var \Magento\User\Model\User $user */
                             $user = $this->_userFactory->create()->load($item->getId());
                             if ($user->getId()) {
-                                $newPassResetToken = $this->_backendDataHelper->generateResetPasswordLinkToken();
+                                $newPassResetToken = $this->backendDataHelper->generateResetPasswordLinkToken();
                                 $user->changeResetPasswordLinkToken($newPassResetToken);
                                 $user->save();
                                 $user->sendPasswordResetConfirmationEmail();
@@ -103,7 +112,7 @@ public function execute()
                 $this->messageManager->addSuccess(__('We\'ll email you a link to reset your password.'));
                 // @codingStandardsIgnoreEnd
                 $this->getResponse()->setRedirect(
-                    $this->_backendDataHelper->getHomePageUrl()
+                    $this->backendDataHelper->getHomePageUrl()
                 );
                 return;
             } else {

app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php

@@ -7,9 +7,27 @@
 namespace Magento\User\Controller\Adminhtml\Auth;
 
 use Magento\User\Controller\Adminhtml\Auth;
+use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Helper\Data;
 
 class ResetPasswordPost extends Auth
 {
+    /**
+     * @var Data
+     */
+    private $backendDataHelper;
+
+    /**
+     * @param Context $context
+     * @param Data $backendDataHelper
+     */
+    public function __construct(
+        Context $context,
+        Data $backendDataHelper = null
+    ) {
+        parent::__construct($context, $userFactory);
+        $this->backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class);
+    }
     /**
      * Reset forgotten password
      *
@@ -29,7 +47,7 @@ public function execute()
         } catch (\Exception $exception) {
             $this->messageManager->addError(__('Your password reset link has expired.'));
             $this->getResponse()->setRedirect(
-                $this->_backendDataHelper->getHomePageUrl()
+                $this->backendDataHelper->getHomePageUrl()
             );
             return;
         }
@@ -55,7 +73,7 @@ public function execute()
                 $user->save();
                 $this->messageManager->addSuccess(__('You updated your password.'));
                 $this->getResponse()->setRedirect(
-                    $this->_backendDataHelper->getHomePageUrl()
+                    $this->backendDataHelper->getHomePageUrl()
                 );
             }
         } catch (\Magento\Framework\Validator\Exception $exception) {