0043372: [20Q1] [NewSkin] [UX] Incorrect text placement of error message when inputting a weak password in "Password Change" popup

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1585663154 -19800
#      Tue Mar 31 19:29:14 2020 +0530
# Node ID 129a995f907aa780ece9a214d8a4382eb2981f21
# Parent  b4ee2649722cdb6ba105d9684ec7483a1f64b9e3
Fixed BUG-43372: Fixed following in Password Expiry
* Moved error message from footer to below header
* Displayed only error, removed error title

diff -r b4ee2649722c -r 129a995f907a web/org.openbravo.mobile.core/assets/css/obmobc-main.css
--- a/web/org.openbravo.mobile.core/assets/css/obmobc-main.css	Thu Apr 02 05:10:09 2020 +0000
+++ b/web/org.openbravo.mobile.core/assets/css/obmobc-main.css	Tue Mar 31 19:29:14 2020 +0530
@@ -4352,7 +4352,7 @@
 
 .obUiExpirationPassword-body-scroller {
   /* Inherits: [Scroller] */
-  max-height: 225px;
+  max-height: 325px;
   background-color: #ffffff;
   overflow-x: hidden;
 }
@@ -4361,6 +4361,10 @@
   padding-bottom: 20px;
 }
 
+.obUiExpirationPassword-scroller-newheader:empty {
+  display:none;	
+}
+
 .obUiExpirationPassword-scroller-attributes {}
 
 .obUiExpirationPassword-scroller-attributes .obUiFormElement_dataFilter.obUiFormElement {
@@ -4375,10 +4379,14 @@
   /* Inherits: [OB.UI.renderTextProperty] */
 }
 
-.obUiExpirationPassword-footer-error {
+.obUiExpirationPassword-scroller-error {
   color: var(--color-on-message_error);
 }
 
+.obUiExpirationPassword-scroller-error:empty {
+  display: none	
+}
+
 .obUiExpirationPassword-footer {}
 
 .obUiExpirationPassword-footer-expirationOkButton {}
diff -r b4ee2649722c -r 129a995f907a web/org.openbravo.mobile.core/source/component/dialog/ob-expirationpassword.js
--- a/web/org.openbravo.mobile.core/source/component/dialog/ob-expirationpassword.js	Thu Apr 02 05:10:09 2020 +0000
+++ b/web/org.openbravo.mobile.core/source/component/dialog/ob-expirationpassword.js	Tue Mar 31 19:29:14 2020 +0530
@@ -67,6 +67,11 @@
         classes: 'obUiExpirationPassword-scroller-newheader'
       },
       {
+        name: 'error',
+        content: '',
+        classes: 'obUiExpirationPassword-scroller-error'
+      },
+      {
         name: 'attributes',
         classes: 'obUiExpirationPassword-scroller-attributes'
       }
@@ -76,11 +81,6 @@
     classes: 'obUiModal-footer-mainButtons obUiExpirationPassword-footer',
     components: [
       {
-        name: 'error',
-        content: '',
-        classes: 'obUiExpirationPassword-footer-error'
-      },
-      {
         kind: 'OB.UI.ModalDialogButton',
         i18nContent: 'OBMOBC_LblCancel',
         classes: 'obUiExpirationPassword-footer-obUiModalDialogButton',
@@ -102,15 +102,18 @@
     var inputpassword = this.propertycomponents.password;
     var inputconfirmpassword = this.propertycomponents.confirmpassword;
     var messagenewheader = this.$.body.$.newheader;
-    this.$.footer.$.error.setContent('');
+    messagenewheader.setContent('');
+    this.$.body.$.error.setContent('');
     if (inputpassword.getValue() === '') {
-      messagenewheader.setContent(OB.I18N.getLabel('OBMOBC_EmptyPassword'));
+      this.$.body.$.error.setContent(OB.I18N.getLabel('OBMOBC_EmptyPassword'));
       OB.MobileApp.model.set('isLoggingIn', false);
       return;
     } else if (inputpassword.getValue() !== inputconfirmpassword.getValue()) {
       inputconfirmpassword.setValue('');
       inputpassword.setValue('');
-      messagenewheader.setContent(OB.I18N.getLabel('OBMOBC_DifferentPassword'));
+      this.$.body.$.error.setContent(
+        OB.I18N.getLabel('OBMOBC_DifferentPassword')
+      );
       OB.MobileApp.model.set('isLoggingIn', false);
       return;
     }
@@ -126,7 +129,7 @@
     return;
   },
   executeOnShow: function() {
-    this.$.footer.$.error.setContent('');
+    this.$.body.$.error.setContent('');
   },
   initComponents: function() {
     this.inherited(arguments);
diff -r b4ee2649722c -r 129a995f907a web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js	Thu Apr 02 05:10:09 2020 +0000
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js	Tue Mar 31 19:29:14 2020 +0530
@@ -3125,12 +3125,13 @@
                 }
               );
               this.dialog.show();
-              this.dialog.$.body.$.newheader.setContent(
-                inResponse.messageTitle
-              );
 
               if (inResponse.attemptedChange) {
-                this.dialog.$.footer.$.error.setContent(inResponse.messageText);
+                this.dialog.$.body.$.error.setContent(inResponse.messageText);
+              } else {
+                this.dialog.$.body.$.newheader.setContent(
+                  inResponse.messageTitle
+                );
               }
 
               return;

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1585804834 -19800
#      Thu Apr 02 10:50:34 2020 +0530
# Node ID a2708749dd0b1de8d0a12383fc6d5e93bfeeb825
# Parent  8138a7ebd1e83d43e24e368d7c909dc56e4f972a
Related to BUG-43372: Interchanged title and error message of SameAsoldPasswordError

diff -r 8138a7ebd1e8 -r a2708749dd0b src/org/openbravo/base/secureApp/LoginHandler.java
--- a/src/org/openbravo/base/secureApp/LoginHandler.java	Wed Apr 01 14:01:02 2020 +0000
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java	Thu Apr 02 10:50:34 2020 +0530
@@ -605,7 +605,7 @@
           .uniqueResult();
 
       if (PasswordHash.matches(newPassword, user.getPassword())) {
-        throwChangePasswordException("CPDifferentPassword", "CPSamePasswordThanOld", language);
+        throwChangePasswordException("CPSamePasswordThanOld", "CPDifferentPassword", language);
       } else if (!passwordStrengthChecker.isStrongPassword(newPassword)) {
         throwChangePasswordException("CPWeakPasswordTitle", "CPPasswordNotStrongEnough", language);
       } else {

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1585814068 -19800
#      Thu Apr 02 13:24:28 2020 +0530
# Node ID fdc33cbd86914a34be0d66698f59f47b49164987
# Parent  94e7ba4ede556246a184f29f3f070630e7ab078e
Related to BUG-43372: Changed error display in password expiry

diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java	Thu Apr 02 13:24:28 2020 +0530
@@ -67,7 +67,7 @@
     tap(TestIdCore.BUTTON_APPLY_NEW_PASSWORD);
 
     // Check pop up body message changes. Then change the password
-    verify(TestIdExtModules.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+    verify(TestIdExtModules.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
     write(TestIdExtModules.FIELD_LOGIN_NEWPASSWORD, USER.getNewPassword());
     write(TestIdExtModules.FIELD_LOGIN_CONFIRMPASSWORD, USER.getNewPassword());
     tap(TestIdExtModules.BUTTON_APPLY_NEW_PASSWORD);
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java	Thu Apr 02 13:24:28 2020 +0530
@@ -43,6 +43,7 @@
   public static TestIdConstructor FIELD_LOGIN_CONFIRMPASSWORD = new TestIdConstructor(
       "coreElementContainer_confirmpassword"); //
   public static TestIdConstructor LABEL_LOGIN_NEWPASSWORD = new TestIdConstructor("body_newheader"); //
+  public static TestIdConstructor LABEL_LOGIN_ERROR = new TestIdConstructor("body_error"); //
   public static TestIdConstructor BUTTON_EXPIRATIONOK = new TestIdConstructor(
       "footer_expirationOkButton", EnyoKind.BUTTON); //
   public static TestIdConstructor BUTTON_CONFIRM_POPUP_LOGIN_OK = new TestIdConstructor(
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java	Thu Apr 02 13:24:28 2020 +0530
@@ -83,7 +83,7 @@
     write(TestIdPack.FIELD_CONFIRM_NEW_PASSWORD, weakPassword);
     OBUtils.pause(OBConstants.WAIT_FORUITOUPDATE);
     tap(TestIdPack.BUTTON_APPLY_NEW_PASSWORD);
-    verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Weak password. Please provide a stronger one");
+    verify(TestIdPack.LABEL_LOGIN_ERROR, "Passwords must have at least 8 characters and contain at least three of the following: uppercase letters, lowercase letters, numbers and symbols.");
 
     tap(TestIdPack.BUTTON_CANCEL_NEW_PASSWORD);
     logIn();
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java	Thu Apr 02 13:24:28 2020 +0530
@@ -64,20 +64,20 @@
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, originalPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, originalPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD,
+      verify(TestIdPack.LABEL_LOGIN_ERROR,
           "Password must be different from the previous one");
 
       // Add wrong confirm pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, originalPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, newPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+      verify(TestIdPack.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
 
       // Add wrong confirm pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, newPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, originalPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+      verify(TestIdPack.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
 
       // Add new pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, newPassword);