Skip to content

Commit adec3da

Browse files
committed
changes as per comments on GitHub
1 parent b4f2e27 commit adec3da

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
namespace Magento\User\Controller\Adminhtml;
77

88
use Magento\Framework\Encryption\Helper\Security;
9-
use Magento\Framework\App\ObjectManager;
109
use Magento\Backend\App\AbstractAction;
1110
use Magento\Backend\App\Action\Context;
1211
use Magento\User\Model\UserFactory;
13-
use Magento\Backend\Helper\Data;
1412
use Magento\Framework\Exception\LocalizedException;
1513

1614
/**
@@ -24,27 +22,19 @@ abstract class Auth extends AbstractAction
2422
* @var UserFactory
2523
*/
2624
protected $_userFactory;
27-
28-
/**
29-
* @var Data
30-
*/
31-
protected $_backendDataHelper;
3225

3326
/**
3427
* Construct
3528
*
3629
* @param Context $context
3730
* @param UserFactory $userFactory
38-
* @param Data $backendDataHelper
3931
*/
4032
public function __construct(
4133
Context $context,
42-
UserFactory $userFactory,
43-
Data $backendDataHelper = null
34+
UserFactory $userFactory
4435
) {
4536
parent::__construct($context);
4637
$this->_userFactory = $userFactory;
47-
$this->_backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class);
4838
}
4939

5040
/**

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,27 @@
1515
use Magento\Security\Model\PasswordResetRequestEvent;
1616
use Magento\Framework\Exception\SecurityViolationException;
1717
use Magento\User\Controller\Adminhtml\Auth;
18+
use Magento\Backend\Helper\Data;
1819

1920
class Forgotpassword extends Auth
2021
{
2122
/**
2223
* @var SecurityManager
2324
*/
2425
protected $securityManager;
25-
26+
2627
/**
2728
* User model factory
2829
*
2930
* @var CollectionFactory
3031
*/
3132
private $userCollectionFactory;
3233

34+
/**
35+
* @var Data
36+
*/
37+
private $backendDataHelper;
38+
3339
/**
3440
* @param Context $context
3541
* @param UserFactory $userFactory
@@ -40,12 +46,15 @@ public function __construct(
4046
Context $context,
4147
UserFactory $userFactory,
4248
SecurityManager $securityManager,
43-
CollectionFactory $userCollectionFactory = null
49+
CollectionFactory $userCollectionFactory = null,
50+
Data $backendDataHelper = null
4451
) {
4552
parent::__construct($context, $userFactory);
4653
$this->securityManager = $securityManager;
4754
$this->userCollectionFactory = $userCollectionFactory ?:
4855
ObjectManager::getInstance()->get(CollectionFactory::class);
56+
$this->backendDataHelper = $backendDataHelper ?:
57+
ObjectManager::getInstance()->get(Data::class);
4958
}
5059

5160
/**
@@ -84,7 +93,7 @@ public function execute()
8493
/** @var \Magento\User\Model\User $user */
8594
$user = $this->_userFactory->create()->load($item->getId());
8695
if ($user->getId()) {
87-
$newPassResetToken = $this->_backendDataHelper->generateResetPasswordLinkToken();
96+
$newPassResetToken = $this->backendDataHelper->generateResetPasswordLinkToken();
8897
$user->changeResetPasswordLinkToken($newPassResetToken);
8998
$user->save();
9099
$user->sendPasswordResetConfirmationEmail();
@@ -103,7 +112,7 @@ public function execute()
103112
$this->messageManager->addSuccess(__('We\'ll email you a link to reset your password.'));
104113
// @codingStandardsIgnoreEnd
105114
$this->getResponse()->setRedirect(
106-
$this->_backendDataHelper->getHomePageUrl()
115+
$this->backendDataHelper->getHomePageUrl()
107116
);
108117
return;
109118
} else {

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,27 @@
77
namespace Magento\User\Controller\Adminhtml\Auth;
88

99
use Magento\User\Controller\Adminhtml\Auth;
10+
use Magento\Framework\App\ObjectManager;
11+
use Magento\Backend\Helper\Data;
1012

1113
class ResetPasswordPost extends Auth
1214
{
15+
/**
16+
* @var Data
17+
*/
18+
private $backendDataHelper;
19+
20+
/**
21+
* @param Context $context
22+
* @param Data $backendDataHelper
23+
*/
24+
public function __construct(
25+
Context $context,
26+
Data $backendDataHelper = null
27+
) {
28+
parent::__construct($context, $userFactory);
29+
$this->backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class);
30+
}
1331
/**
1432
* Reset forgotten password
1533
*
@@ -29,7 +47,7 @@ public function execute()
2947
} catch (\Exception $exception) {
3048
$this->messageManager->addError(__('Your password reset link has expired.'));
3149
$this->getResponse()->setRedirect(
32-
$this->_backendDataHelper->getHomePageUrl()
50+
$this->backendDataHelper->getHomePageUrl()
3351
);
3452
return;
3553
}
@@ -55,7 +73,7 @@ public function execute()
5573
$user->save();
5674
$this->messageManager->addSuccess(__('You updated your password.'));
5775
$this->getResponse()->setRedirect(
58-
$this->_backendDataHelper->getHomePageUrl()
76+
$this->backendDataHelper->getHomePageUrl()
5977
);
6078
}
6179
} catch (\Magento\Framework\Validator\Exception $exception) {

0 commit comments

Comments
 (0)