ENGCOM-2519: [Forwardport] Reduce lengthy code of LoginPost #17107

Author: Stanislav Idolov

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

@@ -202,31 +202,28 @@ public function execute()
                         'This account is not confirmed. <a href="%1">Click here</a> to resend confirmation email.',
                         $value
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (UserLockedException $e) {
                     $message = __(
                         'The account sign-in was incorrect or your account is disabled temporarily. '
                         . 'Please wait and try again later.'
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (AuthenticationException $e) {
                     $message = __(
                         'The account sign-in was incorrect or your account is disabled temporarily. '
                         . 'Please wait and try again later.'
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (LocalizedException $e) {
                     $message = $e->getMessage();
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (\Exception $e) {
                     // PA DSS violation: throwing or logging an exception here can disclose customer password
                     $this->messageManager->addError(
                         __('An unspecified error occurred. Please contact us for assistance.')
                     );
+                } finally {
+                    if (isset($message)) {
+                        $this->messageManager->addError($message);
+                        $this->session->setUsername($login['username']);
+                    }
                 }
             } else {
                 $this->messageManager->addError(__('A login and a password are required.'));