From 8749f6954e6737a9bbc8cd0b4b1f076ab0349692 Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Thu, 5 Jul 2018 18:02:24 +0530 Subject: [PATCH 1/6] Admin user auth controller refactor --- .../User/Controller/Adminhtml/Auth.php | 12 +++++++++- .../Adminhtml/Auth/Forgotpassword.php | 22 ++++++++++++++----- .../Adminhtml/Auth/ResetPasswordPost.php | 4 ++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php index 173fdcc764f6f..12940c66c0f85 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php @@ -7,6 +7,7 @@ namespace Magento\User\Controller\Adminhtml; use Magento\Framework\Encryption\Helper\Security; +use Magento\Framework\App\ObjectManager; /** * \Magento\User Auth controller @@ -19,19 +20,28 @@ abstract class Auth extends \Magento\Backend\App\AbstractAction * @var \Magento\User\Model\UserFactory */ protected $_userFactory; + + /** + * @var \Magento\Backend\Helper\Data + */ + protected $_backendHelper; /** * Construct * * @param \Magento\Backend\App\Action\Context $context * @param \Magento\User\Model\UserFactory $userFactory + * @param \Magento\Backend\Helper\Data $backendHelper */ public function __construct( \Magento\Backend\App\Action\Context $context, - \Magento\User\Model\UserFactory $userFactory + \Magento\User\Model\UserFactory $userFactory, + \Magento\Backend\Helper\Data $backendHelper = null ) { parent::__construct($context); $this->_userFactory = $userFactory; + $this->_backendHelper = $backendHelper ?: + ObjectManager::getInstance()->get(\Magento\Backend\Helper\Data::class); } /** diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php index cd4c3d6950685..a3021b798550e 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php @@ -7,6 +7,7 @@ namespace Magento\User\Controller\Adminhtml\Auth; use Magento\Security\Model\SecurityManager; +use Magento\Framework\App\ObjectManager; class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth { @@ -14,19 +15,30 @@ class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth * @var SecurityManager */ protected $securityManager; + + /** + * User model factory + * + * @var \Magento\User\Model\ResourceModel\User\CollectionFactory + */ + private $userCollectionFactory; /** * @param \Magento\Backend\App\Action\Context $context * @param \Magento\User\Model\UserFactory $userFactory * @param \Magento\Security\Model\SecurityManager $securityManager + * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory */ public function __construct( \Magento\Backend\App\Action\Context $context, \Magento\User\Model\UserFactory $userFactory, - \Magento\Security\Model\SecurityManager $securityManager + \Magento\Security\Model\SecurityManager $securityManager, + \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory = null ) { parent::__construct($context, $userFactory); $this->securityManager = $securityManager; + $this->userCollectionFactory = $userCollectionFactory ?: + ObjectManager::getInstance()->get(\Magento\User\Model\ResourceModel\User\CollectionFactory::class); } /** @@ -54,7 +66,7 @@ public function execute() $this->messageManager->addErrorMessage($exception->getMessage()); return $resultRedirect->setPath('admin'); } - $collection = $this->_objectManager->get(\Magento\User\Model\ResourceModel\User\Collection::class); + $collection = $this->userCollectionFactory->create(); /** @var $collection \Magento\User\Model\ResourceModel\User\Collection */ $collection->addFieldToFilter('email', $email); $collection->load(false); @@ -65,9 +77,7 @@ public function execute() /** @var \Magento\User\Model\User $user */ $user = $this->_userFactory->create()->load($item->getId()); if ($user->getId()) { - $newPassResetToken = $this->_objectManager->get( - \Magento\User\Helper\Data::class - )->generateResetPasswordLinkToken(); + $newPassResetToken = $this->_backendHelper->generateResetPasswordLinkToken(); $user->changeResetPasswordLinkToken($newPassResetToken); $user->save(); $user->sendPasswordResetConfirmationEmail(); @@ -86,7 +96,7 @@ public function execute() $this->messageManager->addSuccess(__('We\'ll email you a link to reset your password.')); // @codingStandardsIgnoreEnd $this->getResponse()->setRedirect( - $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl() + $this->_backendHelper->getHomePageUrl() ); return; } else { diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index 2c6be98439919..e17331519f60a 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php @@ -27,7 +27,7 @@ public function execute() } catch (\Exception $exception) { $this->messageManager->addError(__('Your password reset link has expired.')); $this->getResponse()->setRedirect( - $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl() + $this->_backendHelper->getHomePageUrl() ); return; } @@ -53,7 +53,7 @@ public function execute() $user->save(); $this->messageManager->addSuccess(__('You updated your password.')); $this->getResponse()->setRedirect( - $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl() + $this->_backendHelper->getHomePageUrl() ); } } catch (\Magento\Framework\Validator\Exception $exception) { From b94ba641921badf7371383c404bdf7b1621350a3 Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Fri, 6 Jul 2018 10:07:39 +0530 Subject: [PATCH 2/6] Changes as per comments on Github --- .../User/Controller/Adminhtml/Auth.php | 34 ++++++++------- .../Adminhtml/Auth/Forgotpassword.php | 42 +++++++++++-------- .../Adminhtml/Auth/ResetPasswordPost.php | 8 ++-- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php index 12940c66c0f85..abd1d33696b49 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php @@ -8,11 +8,16 @@ 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; /** * \Magento\User Auth controller */ -abstract class Auth extends \Magento\Backend\App\AbstractAction +abstract class Auth extends AbstractAction { /** * User model factory @@ -24,24 +29,23 @@ abstract class Auth extends \Magento\Backend\App\AbstractAction /** * @var \Magento\Backend\Helper\Data */ - protected $_backendHelper; + protected $_backendDataHelper; /** * Construct * - * @param \Magento\Backend\App\Action\Context $context - * @param \Magento\User\Model\UserFactory $userFactory - * @param \Magento\Backend\Helper\Data $backendHelper + * @param Context $context + * @param UserFactory $userFactory + * @param Data $backendDataHelper */ public function __construct( - \Magento\Backend\App\Action\Context $context, - \Magento\User\Model\UserFactory $userFactory, - \Magento\Backend\Helper\Data $backendHelper = null + Context $context, + UserFactory $userFactory, + Data $backendDataHelper = null ) { parent::__construct($context); $this->_userFactory = $userFactory; - $this->_backendHelper = $backendHelper ?: - ObjectManager::getInstance()->get(\Magento\Backend\Helper\Data::class); + $this->_backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class); } /** @@ -50,7 +54,7 @@ public function __construct( * @param int $userId * @param string $resetPasswordToken * @return void - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken) { @@ -60,22 +64,20 @@ protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken) $resetPasswordToken ) || empty($resetPasswordToken) || empty($userId) || $userId < 0 ) { - throw new \Magento\Framework\Exception\LocalizedException( - __('The password reset token is incorrect. Verify the token and try again.') - ); + throw new LocalizedException(__('Please correct the password reset token.')); } /** @var $user \Magento\User\Model\User */ $user = $this->_userFactory->create()->load($userId); if (!$user->getId()) { - throw new \Magento\Framework\Exception\LocalizedException( + throw new LocalizedException( __('Please specify the correct account and try again.') ); } $userToken = $user->getRpToken(); if (!Security::compareStrings($userToken, $resetPasswordToken) || $user->isResetPasswordLinkTokenExpired()) { - throw new \Magento\Framework\Exception\LocalizedException(__('Your password reset link has expired.')); + throw new LocalizedException(__('Your password reset link has expired.')); } } diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php index a3021b798550e..9a1fcd5dc75c0 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php @@ -8,8 +8,16 @@ use Magento\Security\Model\SecurityManager; use Magento\Framework\App\ObjectManager; +use Magento\Backend\App\Action\Context; +use Magento\User\Model\UserFactory; +use Magento\Security\Model\SecurityManager; +use Magento\User\Model\ResourceModel\User\CollectionFactory; +use Magento\Framework\Validator\EmailAddress; +use Magento\Security\Model\PasswordResetRequestEvent; +use Magento\Framework\Exception\SecurityViolationException; +use Magento\User\Controller\Adminhtml\Auth; -class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth +class Forgotpassword extends Auth { /** * @var SecurityManager @@ -19,26 +27,26 @@ class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth /** * User model factory * - * @var \Magento\User\Model\ResourceModel\User\CollectionFactory + * @var CollectionFactory */ private $userCollectionFactory; /** - * @param \Magento\Backend\App\Action\Context $context - * @param \Magento\User\Model\UserFactory $userFactory - * @param \Magento\Security\Model\SecurityManager $securityManager - * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory + * @param Context $context + * @param UserFactory $userFactory + * @param SecurityManager $securityManager + * @param CollectionFactory $userCollectionFactory */ public function __construct( - \Magento\Backend\App\Action\Context $context, - \Magento\User\Model\UserFactory $userFactory, - \Magento\Security\Model\SecurityManager $securityManager, - \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory = null + Context $context, + UserFactory $userFactory, + SecurityManager $securityManager, + CollectionFactory $userCollectionFactory = null ) { parent::__construct($context, $userFactory); $this->securityManager = $securityManager; $this->userCollectionFactory = $userCollectionFactory ?: - ObjectManager::getInstance()->get(\Magento\User\Model\ResourceModel\User\CollectionFactory::class); + ObjectManager::getInstance()->get(CollectionFactory::class); } /** @@ -56,18 +64,18 @@ public function execute() $resultRedirect = $this->resultRedirectFactory->create(); if (!empty($email) && !empty($params)) { // Validate received data to be an email address - if (\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) { + if (\Zend_Validate::is($email, EmailAddress::class)) { try { $this->securityManager->performSecurityCheck( - \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST, + PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST, $email ); - } catch (\Magento\Framework\Exception\SecurityViolationException $exception) { + } catch (SecurityViolationException $exception) { $this->messageManager->addErrorMessage($exception->getMessage()); return $resultRedirect->setPath('admin'); } - $collection = $this->userCollectionFactory->create(); /** @var $collection \Magento\User\Model\ResourceModel\User\Collection */ + $collection = $this->userCollectionFactory->create(); $collection->addFieldToFilter('email', $email); $collection->load(false); @@ -77,7 +85,7 @@ public function execute() /** @var \Magento\User\Model\User $user */ $user = $this->_userFactory->create()->load($item->getId()); if ($user->getId()) { - $newPassResetToken = $this->_backendHelper->generateResetPasswordLinkToken(); + $newPassResetToken = $this->_backendDataHelper->generateResetPasswordLinkToken(); $user->changeResetPasswordLinkToken($newPassResetToken); $user->save(); $user->sendPasswordResetConfirmationEmail(); @@ -96,7 +104,7 @@ public function execute() $this->messageManager->addSuccess(__('We\'ll email you a link to reset your password.')); // @codingStandardsIgnoreEnd $this->getResponse()->setRedirect( - $this->_backendHelper->getHomePageUrl() + $this->_backendDataHelper->getHomePageUrl() ); return; } else { diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index e17331519f60a..99bdf1a9dac26 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php @@ -6,7 +6,9 @@ */ namespace Magento\User\Controller\Adminhtml\Auth; -class ResetPasswordPost extends \Magento\User\Controller\Adminhtml\Auth +use Magento\User\Controller\Adminhtml\Auth; + +class ResetPasswordPost extends Auth { /** * Reset forgotten password @@ -27,7 +29,7 @@ public function execute() } catch (\Exception $exception) { $this->messageManager->addError(__('Your password reset link has expired.')); $this->getResponse()->setRedirect( - $this->_backendHelper->getHomePageUrl() + $this->_backendDataHelper->getHomePageUrl() ); return; } @@ -53,7 +55,7 @@ public function execute() $user->save(); $this->messageManager->addSuccess(__('You updated your password.')); $this->getResponse()->setRedirect( - $this->_backendHelper->getHomePageUrl() + $this->_backendDataHelper->getHomePageUrl() ); } } catch (\Magento\Framework\Validator\Exception $exception) { From 0322eb6d24e8bb12f00f0b7194ca188f9dd01739 Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Fri, 6 Jul 2018 11:50:34 +0530 Subject: [PATCH 3/6] Changes as per comments on Github --- app/code/Magento/User/Controller/Adminhtml/Auth.php | 4 ++-- .../Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php index abd1d33696b49..47d8b39e7d441 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php @@ -22,12 +22,12 @@ abstract class Auth extends AbstractAction /** * User model factory * - * @var \Magento\User\Model\UserFactory + * @var UserFactory */ protected $_userFactory; /** - * @var \Magento\Backend\Helper\Data + * @var Data */ protected $_backendDataHelper; diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php index 9a1fcd5dc75c0..21d9611cf1207 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php @@ -10,7 +10,6 @@ use Magento\Framework\App\ObjectManager; use Magento\Backend\App\Action\Context; use Magento\User\Model\UserFactory; -use Magento\Security\Model\SecurityManager; use Magento\User\Model\ResourceModel\User\CollectionFactory; use Magento\Framework\Validator\EmailAddress; use Magento\Security\Model\PasswordResetRequestEvent; From 0a9ae1e8d8dab0944dfa9517bbc352201e9d00de Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Wed, 11 Jul 2018 13:19:07 +0530 Subject: [PATCH 4/6] changes as per comments on GitHub --- .../User/Controller/Adminhtml/Auth.php | 12 +--------- .../Adminhtml/Auth/Forgotpassword.php | 17 ++++++++++---- .../Adminhtml/Auth/ResetPasswordPost.php | 22 +++++++++++++++++-- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php index 47d8b39e7d441..ea539b64a5cc3 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth.php +++ b/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); } /** diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php index 21d9611cf1207..c0e78fae2c2c6 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php @@ -15,6 +15,7 @@ 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 { @@ -22,7 +23,7 @@ class Forgotpassword extends Auth * @var SecurityManager */ protected $securityManager; - + /** * User model factory * @@ -30,6 +31,11 @@ class Forgotpassword extends Auth */ 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 { diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index 99bdf1a9dac26..b0d7d939c2409 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/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) { From 4f0a6ab9dde9da3a6ae14bda7161c900976249db Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Wed, 11 Jul 2018 14:37:43 +0530 Subject: [PATCH 5/6] missing parameter correction --- .../User/Controller/Adminhtml/Auth/ResetPasswordPost.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index b0d7d939c2409..f36efa2e2eb09 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php @@ -9,6 +9,7 @@ use Magento\User\Controller\Adminhtml\Auth; use Magento\Framework\App\ObjectManager; use Magento\Backend\Helper\Data; +use Magento\User\Model\UserFactory; class ResetPasswordPost extends Auth { @@ -19,10 +20,12 @@ class ResetPasswordPost extends Auth /** * @param Context $context + * @param UserFactory $userFactory * @param Data $backendDataHelper */ public function __construct( Context $context, + UserFactory $userFactory, Data $backendDataHelper = null ) { parent::__construct($context, $userFactory); From e740014aae149a03578570b8ea6729ef1a8fbae5 Mon Sep 17 00:00:00 2001 From: Anshu Mishra Date: Thu, 12 Jul 2018 10:41:11 +0530 Subject: [PATCH 6/6] included missing context class --- .../Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index f36efa2e2eb09..c2e29534b1251 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php @@ -7,6 +7,7 @@ namespace Magento\User\Controller\Adminhtml\Auth; use Magento\User\Controller\Adminhtml\Auth; +use Magento\Backend\App\Action\Context; use Magento\Framework\App\ObjectManager; use Magento\Backend\Helper\Data; use Magento\User\Model\UserFactory;