|
3 | 3 | * Copyright © Magento, Inc. All rights reserved.
|
4 | 4 | * See COPYING.txt for license details.
|
5 | 5 | */
|
| 6 | +declare(strict_types=1); |
| 7 | + |
6 | 8 | namespace Magento\Customer\Controller\Account;
|
7 | 9 |
|
8 | 10 | use Magento\Customer\Api\AccountManagementInterface;
|
|
13 | 15 | use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
|
14 | 16 | use Magento\Framework\App\Action\Context;
|
15 | 17 | use Magento\Framework\App\ObjectManager;
|
| 18 | +use Magento\Framework\Exception\NoSuchEntityException; |
16 | 19 | use Magento\Framework\Exception\State\InvalidTransitionException;
|
17 | 20 | use Magento\Framework\View\Result\PageFactory;
|
18 | 21 | use Magento\Store\Model\StoreManagerInterface;
|
@@ -97,25 +100,28 @@ public function execute()
|
97 | 100 | $this->storeManager->getStore()->getWebsiteId()
|
98 | 101 | );
|
99 | 102 | $this->messageManager->addSuccessMessage(__('Please check your email for confirmation key.'));
|
| 103 | + $this->session->setUsername($email); |
| 104 | + $resultRedirect->setPath('*/*/index', ['_secure' => true]); |
| 105 | + |
| 106 | + return $resultRedirect; |
100 | 107 | } catch (InvalidTransitionException $e) {
|
101 | 108 | $this->messageManager->addSuccessMessage(__('This email does not require confirmation.'));
|
102 |
| - } catch (\Exception $e) { |
103 |
| - $this->messageManager->addExceptionMessage($e, __('Wrong email.')); |
104 |
| - $resultRedirect->setPath('*/*/*', ['email' => $email, '_secure' => true]); |
| 109 | + $this->session->setUsername($email); |
| 110 | + $resultRedirect->setPath('*/*/index', ['_secure' => true]); |
| 111 | + |
105 | 112 | return $resultRedirect;
|
| 113 | + } catch (NoSuchEntityException $e) { |
| 114 | + $this->messageManager->addErrorMessage(__('Wrong email.')); |
106 | 115 | }
|
107 |
| - $this->session->setUsername($email); |
108 |
| - $resultRedirect->setPath('*/*/index', ['_secure' => true]); |
109 |
| - return $resultRedirect; |
110 | 116 | }
|
111 | 117 |
|
112 | 118 | /** @var \Magento\Framework\View\Result\Page $resultPage */
|
113 | 119 | $resultPage = $this->resultPageFactory->create();
|
114 |
| - $resultPage->getLayout()->getBlock('accountConfirmation')->setEmail( |
115 |
| - $this->getRequest()->getParam('email', $email) |
116 |
| - )->setLoginUrl( |
117 |
| - $this->customerUrl->getLoginUrl() |
118 |
| - ); |
| 120 | + $resultPage->getLayout() |
| 121 | + ->getBlock('accountConfirmation') |
| 122 | + ->setEmail($email) |
| 123 | + ->setLoginUrl($this->customerUrl->getLoginUrl()); |
| 124 | + |
119 | 125 | return $resultPage;
|
120 | 126 | }
|
121 | 127 | }
|
0 commit comments