Update error message when password is too long (#6001)

3 files changed, 27 insertions, 24 deletions

diff --git a/webapp/components/admin_console/password_settings.jsx b/webapp/components/admin_console/password_settings.jsx
index 2b0ea652f..68506fcfe 100644
--- a/webapp/components/admin_console/password_settings.jsx
+++ b/webapp/components/admin_console/password_settings.jsx
@@ -53,9 +53,10 @@ export default class PasswordSettings extends AdminSettings {
             this.sampleErrorMsg = (
                 <FormattedMessage
                     id={sampleErrorMsgId}
-                    default='Your password must be at least {min} characters.'
+                    default='Your password must contain between {min} and {max} characters.'
                     values={{
-                        min: (this.state.passwordMinimumLength || Constants.MIN_PASSWORD_LENGTH)
+                        min: (this.state.passwordMinimumLength || Constants.MIN_PASSWORD_LENGTH),
+                        max: Constants.MAX_PASSWORD_LENGTH
                     }}
                 />
             );
@@ -115,9 +116,10 @@ export default class PasswordSettings extends AdminSettings {
             return (
                 <FormattedMessage
                     id={sampleErrorMsgId}
-                    default='Your password must be at least {min} characters.'
+                    default='Your password must contain between {min} and {max} characters.'
                     values={{
-                        min: (minLength || Constants.MIN_PASSWORD_LENGTH)
+                        min: (minLength || Constants.MIN_PASSWORD_LENGTH),
+                        max: Constants.MAX_PASSWORD_LENGTH
                     }}
                 />
             );
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b32696277..76e8b003a 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1965,7 +1965,7 @@
   "signup_user_completed.office365": "with Office 365",
   "signup_user_completed.onSite": "on {siteName}",
   "signup_user_completed.or": "or",
-  "signup_user_completed.passwordLength": "Please enter at least {min} characters",
+  "signup_user_completed.passwordLength": "Please enter between {min} and {max} characters",
   "signup_user_completed.required": "This field is required",
   "signup_user_completed.reserved": "This username is reserved, please choose a new one.",
   "signup_user_completed.signIn": "Click here to sign in.",
@@ -2314,22 +2314,22 @@
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
   "user.settings.security.password": "Password",
-  "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
-  "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
-  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
-  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
-  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
-  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
-  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
-  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
-  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordError": "Your password must contain between {min} and {max} characters.",
+  "user.settings.security.passwordErrorLowercase": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter and at least one number.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain between {min} and {max} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "Your password must contain between {min} and {max} characters made up of at least one number.",
+  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain between {min} and {max} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "Your password must contain between {min} and {max} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain between {min} and {max} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain between {min} and {max} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain between {min} and {max} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain between {min} and {max} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
   "user.settings.security.passwordGoogleCantUpdate": "Login occurs through Google Apps. Password cannot be updated.",
   "user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index f707e2b28..9a4f5c21f 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -1281,7 +1281,7 @@ export function isValidPassword(password) {
         }
 
         minimumLength = global.window.mm_config.PasswordMinimumLength;
-    } else if (password.length < Constants.MIN_PASSWORD_LENGTH) {
+    } else if (password.length < Constants.MIN_PASSWORD_LENGTH || password.length > Constants.MAX_PASSWORD_LENGTH) {
         error = true;
     }
 
@@ -1289,9 +1289,10 @@ export function isValidPassword(password) {
         errorMsg = (
             <FormattedMessage
                 id={errorId}
-                default='Your password must be at least {min} characters.'
+                default='Your password must contain between {min} and {max} characters.'
                 values={{
-                    min: minimumLength
+                    min: minimumLength,
+                    max: Constants.MAX_PASSWORD_LENGTH
                 }}
             />
         );