Merge remote-tracking branch 'remotes/origin/MAGETWO-37821-Wrong-message-is-displayed-after-exceeding-maximum-login' into develop

Cari Spruiell · Cari Spruiell · commit 69ffa3795e3a · 2015-06-02T16:04:11.000-05:00
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
@@ -145,7 +145,7 @@ public function getCredentialStorage()
     public function login($username, $password)
     {
         if (empty($username) || empty($password)) {
-            self::throwException(__('Please correct the user name or password.'));
+            self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
         }
 
         try {
@@ -162,7 +162,7 @@ public function login($username, $password)
             }
 
             if (!$this->getAuthStorage()->getUser()) {
-                self::throwException(__('Please correct the user name or password.'));
+                self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
             }
         } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
@@ -175,7 +175,9 @@ public function login($username, $password)
                 'backend_auth_user_login_failed',
                 ['user_name' => $username, 'exception' => $e]
             );
-            self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));
+            self::throwException(
+                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+            );
         }
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php b/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
@@ -50,7 +50,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage Please correct the user name or password.
+     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testLoginFailed()
     {
@@ -59,8 +59,9 @@ public function testLoginFailed()
             ->method('create')
             ->with('Magento\Backend\Model\Auth\Credential\StorageInterface')
             ->will($this->returnValue($this->_credentialStorage));
-        $exceptionMock =
-            new \Magento\Framework\Exception\LocalizedException(__('Please correct the user name or password.'));
+        $exceptionMock = new \Magento\Framework\Exception\LocalizedException(
+            __('You did not sign in correctly or your account is temporarily disabled.')
+        );
         $this->_credentialStorage
             ->expects($this->once())
             ->method('login')
diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Backend/i18n/zh_CN.csv b/app/code/Magento/Backend/i18n/zh_CN.csv
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
@@ -79,7 +79,9 @@ public function createAdminAccessToken($username, $password)
              * Constant cannot be created in Auth Model since it uses legacy translation that doesn't support it.
              * Need to make sure that this is refactored once exception handling is updated in Auth Model.
              */
-            throw new AuthenticationException(__('Please correct the user name or password.'));
+            throw new AuthenticationException(
+                __('You did not sign in correctly or your account is temporarily disabled.')
+            );
         }
         return $this->tokenModelFactory->create()->createAdminToken($this->userModel->getId())->getToken();
     }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php
@@ -11,11 +11,11 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertUserWrongCredentialsMessage
+ * Class AssertUserFailedLoginMessage
  */
-class AssertUserWrongCredentialsMessage extends AbstractConstraint
+class AssertUserFailedLoginMessage extends AbstractConstraint
 {
-    const INVALID_CREDENTIALS_MESSAGE = 'Please correct the user name or password.';
+    const FAILED_LOGIN_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
 
     /**
      * Verify incorrect credentials message while login to admin
@@ -33,9 +33,9 @@ public function processAssert(
         $adminAuth->getLoginBlock()->submit();
 
         \PHPUnit_Framework_Assert::assertEquals(
-            self::INVALID_CREDENTIALS_MESSAGE,
+            self::FAILED_LOGIN_MESSAGE,
             $adminAuth->getMessagesBlock()->getErrorMessages(),
-            'Message "' . self::INVALID_CREDENTIALS_MESSAGE . '" is not visible.'
+            'Message "' . self::FAILED_LOGIN_MESSAGE . '" is not visible.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml
@@ -37,7 +37,7 @@
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessSaveMessage"/>
             <constraint name="Magento\User\Test\Constraint\AssertUserInGrid"/>
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut"/>
-            <constraint name="Magento\User\Test\Constraint\AssertUserWrongCredentialsMessage"/>
+            <constraint name="Magento\User\Test\Constraint\AssertUserFailedLoginMessage"/>
         </variation>
         <variation name="CreateAdminUserEntityTestVariation3">
             <data name="user/data/firstname" xsi:type="string">FirstName%isolation%</data>
@@ -76,7 +76,7 @@
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessSaveMessage"/>
             <constraint name="Magento\User\Test\Constraint\AssertUserInGrid"/>
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut"/>
-            <constraint name="Magento\User\Test\Constraint\AssertUserWrongCredentialsMessage"/>
+            <constraint name="Magento\User\Test\Constraint\AssertUserFailedLoginMessage"/>
         </variation>
         <variation name="CreateAdminUserEntityTestVariation6">
             <data name="user/data/username" xsi:type="string">AdminUser%isolation%</data>
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php
@@ -186,7 +186,10 @@ public function testIncorrectLogin($params)
     {
         $this->getRequest()->setPostValue($params);
         $this->dispatch('backend/admin/auth/login');
-        $this->assertContains('Please correct the user name or password.', $this->getResponse()->getBody());
+        $this->assertContains(
+            'You did not sign in correctly or your account is temporarily disabled.',
+            $this->getResponse()->getBody()
+        );
     }
 
     public function incorrectLoginDataProvider()
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
@@ -73,7 +73,7 @@ public function testCreateAdminAccessTokenEmptyOrNullCredentials($username, $pas
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage Please correct the user name or password.
+     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testCreateAdminAccessTokenInvalidCustomer()
     {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function getCredentialStorage()`
`145`	`145`	`public function login($username, $password)`
`146`	`146`	`{`
`147`	`147`	`if (empty($username) \|\| empty($password)) {`
`148`		`- self::throwException(__('Please correct the user name or password.'));`
	`148`	`+ self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`try {`
`@@ -162,7 +162,7 @@ public function login($username, $password)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if (!$this->getAuthStorage()->getUser()) {`
`165`		`- self::throwException(__('Please correct the user name or password.'));`
	`165`	`+ self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));`
`166`	`166`	`}`
`167`	`167`	`} catch (PluginAuthenticationException $e) {`
`168`	`168`	`$this->_eventManager->dispatch(`
`@@ -175,7 +175,9 @@ public function login($username, $password)`
`175`	`175`	`'backend_auth_user_login_failed',`
`176`	`176`	`['user_name' => $username, 'exception' => $e]`
`177`	`177`	`);`
`178`		`- self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));`
	`178`	`+ self::throwException(`
	`179`	`+ __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')`
	`180`	`+ );`
`179`	`181`	`}`
`180`	`182`	`}`
`181`	`183`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,9 @@ public function createAdminAccessToken($username, $password)`
`79`	`79`	`* Constant cannot be created in Auth Model since it uses legacy translation that doesn't support it.`
`80`	`80`	`* Need to make sure that this is refactored once exception handling is updated in Auth Model.`
`81`	`81`	`*/`
`82`		`- throw new AuthenticationException(__('Please correct the user name or password.'));`
	`82`	`+ throw new AuthenticationException(`
	`83`	`+ __('You did not sign in correctly or your account is temporarily disabled.')`
	`84`	`+ );`
`83`	`85`	`}`
`84`	`86`	`return $this->tokenModelFactory->create()->createAdminToken($this->userModel->getId())->getToken();`
`85`	`87`	`}`