Merge remote-tracking branch '39570/remove-email-disclosure' into commpr_787643004

Author: engcom-Charlie

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -99,10 +99,7 @@ public function execute()
                 );
                 $this->messageManager->addSuccessMessage(__('Please check your email for confirmation key.'));
                 return $this->getRedirect('*/*/index', ['_secure' => true]);
-            } catch (InvalidTransitionException $e) {
-                $this->messageManager->addSuccessMessage(__('This email does not require confirmation.'));
-                return $this->getRedirect('*/*/index', ['_secure' => true]);
-            } catch (NoSuchEntityException $e) {
+            } catch (InvalidTransitionException | NoSuchEntityException $e) {
                 $this->messageManager->addErrorMessage(__('Wrong email.'));
             }
         }

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

@@ -254,14 +254,13 @@ public function testActiveUserConfirmationAction()
             );
 
         $this->dispatch('customer/account/confirmation');
-        $this->assertRedirect($this->stringContains('customer/account/index'));
         $this->assertSessionMessages(
             $this->equalTo(
                 [
-                    'This email does not require confirmation.',
+                    'Wrong email.',
                 ]
             ),
-            MessageInterface::TYPE_SUCCESS
+            MessageInterface::TYPE_ERROR
         );
     }