ENGCOM-5733: magento/magento2#: “Bad request” is never shown #24331

Author: sidolov

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

@@ -6,25 +6,27 @@
  */
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Customer\Model\Url;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Controller\AbstractAccount;
 use Magento\Customer\Helper\Address;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\UrlFactory;
 use Magento\Framework\Exception\StateException;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Confirm
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Confirm extends \Magento\Customer\Controller\AbstractAccount
+class Confirm extends AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
@@ -147,13 +149,16 @@ public function execute()
             $resultRedirect->setPath('*/*/');
             return $resultRedirect;
         }
-        try {
-            $customerId = $this->getRequest()->getParam('id', false);
-            $key = $this->getRequest()->getParam('key', false);
-            if (empty($customerId) || empty($key)) {
-                throw new \Exception(__('Bad request.'));
-            }
 
+        $customerId = $this->getRequest()->getParam('id', false);
+        $key = $this->getRequest()->getParam('key', false);
+        if (empty($customerId) || empty($key)) {
+            $this->messageManager->addErrorMessage(__('Bad request.'));
+            $url = $this->urlModel->getUrl('*/*/index', ['_secure' => true]);
+            return $resultRedirect->setUrl($this->_redirect->error($url));
+        }
+
+        try {
             // log in and send greeting email
             $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
             $customer = $this->customerAccountManagement->activate($customerEmail, $key);

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php

@@ -203,10 +203,9 @@ public function testNoCustomerIdInRequest($customerId, $key)
             ->with($this->equalTo('key'), false)
             ->will($this->returnValue($key));
 
-        $exception = new \Exception('Bad request.');
         $this->messageManagerMock->expects($this->once())
-            ->method('addException')
-            ->with($this->equalTo($exception), $this->equalTo('There was an error confirming the account'));
+            ->method('addErrorMessage')
+            ->with(__('Bad request.'));
 
         $testUrl = 'http://example.com';
         $this->urlMock->expects($this->once())
@@ -255,10 +254,12 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['id', false, $customerId],
-                ['key', false, $key],
-            ]);
+            ->willReturnMap(
+                [
+                    ['id', false, $customerId],
+                    ['key', false, $key],
+                ]
+            );
 
         $this->customerRepositoryMock->expects($this->any())
             ->method('getById')
@@ -372,11 +373,13 @@ public function testSuccessRedirect(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['id', false, $customerId],
-                ['key', false, $key],
-                ['back_url', false, $backUrl],
-            ]);
+            ->willReturnMap(
+                [
+                    ['id', false, $customerId],
+                    ['key', false, $key],
+                    ['back_url', false, $backUrl],
+                ]
+            );
 
         $this->customerRepositoryMock->expects($this->any())
             ->method('getById')