Skip to content

Commit 000678b

Browse files
committed
AC-2257: Fix logging level
1 parent aabf11d commit 000678b

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

app/code/Magento/Customer/Controller/Account/Confirmation.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Customer\Controller\Account;
79

810
use Magento\Customer\Api\AccountManagementInterface;
@@ -13,6 +15,7 @@
1315
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1416
use Magento\Framework\App\Action\Context;
1517
use Magento\Framework\App\ObjectManager;
18+
use Magento\Framework\Exception\NoSuchEntityException;
1619
use Magento\Framework\Exception\State\InvalidTransitionException;
1720
use Magento\Framework\View\Result\PageFactory;
1821
use Magento\Store\Model\StoreManagerInterface;
@@ -97,25 +100,28 @@ public function execute()
97100
$this->storeManager->getStore()->getWebsiteId()
98101
);
99102
$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;
100107
} catch (InvalidTransitionException $e) {
101108
$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+
105112
return $resultRedirect;
113+
} catch (NoSuchEntityException $e) {
114+
$this->messageManager->addErrorMessage(__('Wrong email.'));
106115
}
107-
$this->session->setUsername($email);
108-
$resultRedirect->setPath('*/*/index', ['_secure' => true]);
109-
return $resultRedirect;
110116
}
111117

112118
/** @var \Magento\Framework\View\Result\Page $resultPage */
113119
$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+
119125
return $resultPage;
120126
}
121127
}

0 commit comments

Comments
 (0)