Update message when password does not match requirement (#28178)

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Co-authored-by: Caleb Roseland <caleb@calebroseland.com>

server/channels/app/user.go

@@ -255,7 +255,7 @@ func (a *App) createUserOrGuest(c request.CTX, user *model.User, guest bool) (*m
 		case errors.Is(nErr, users.AcceptedDomainError):
 			return nil, model.NewAppError("createUserOrGuest", "api.user.create_user.accepted_domain.app_error", nil, "", http.StatusBadRequest).Wrap(nErr)
 		case errors.As(nErr, &nfErr):
-			return nil, model.NewAppError("createUserOrGuest", "api.user.check_user_password.invalid.app_error", nil, "", http.StatusBadRequest).Wrap(nErr)
+			return nil, model.NewAppError("createUserOrGuest", nfErr.Id(), map[string]interface{}{"Min": *a.Config().PasswordSettings.MinimumLength}, "", http.StatusBadRequest)
 		case errors.Is(nErr, users.UserStoreIsEmptyError):
 			return nil, model.NewAppError("createUserOrGuest", "app.user.store_is_empty.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 		case errors.As(nErr, &invErr):

server/channels/app/users/password.go

@@ -37,47 +37,48 @@ func (us *UserService) isPasswordValid(password string) error {
 func IsPasswordValidWithSettings(password string, settings *model.PasswordSettings) error {
 	id := "model.user.is_valid.pwd"
 	isError := false
+	isMinMaxError := false
 
 	if len(password) < *settings.MinimumLength {
 		isError = true
+		isMinMaxError = true
 		id = id + "_min_length"
 	}
 
 	if len(password) > model.PasswordMaximumLength {
 		isError = true
+		isMinMaxError = true
 		id = id + "_max_length"
 	}
 
-	if *settings.Lowercase {
-		if !strings.ContainsAny(password, model.LowercaseLetters) {
-			isError = true
+	if !isMinMaxError {
+		if *settings.Lowercase {
+			if !strings.ContainsAny(password, model.LowercaseLetters) {
+				isError = true
+				id = id + "_lowercase"
+			}
 		}
 
-		id = id + "_lowercase"
-	}
-
-	if *settings.Uppercase {
-		if !strings.ContainsAny(password, model.UppercaseLetters) {
-			isError = true
+		if *settings.Uppercase {
+			if !strings.ContainsAny(password, model.UppercaseLetters) {
+				isError = true
+				id = id + "_uppercase"
+			}
 		}
 
-		id = id + "_uppercase"
-	}
-
-	if *settings.Number {
-		if !strings.ContainsAny(password, model.NUMBERS) {
-			isError = true
+		if *settings.Number {
+			if !strings.ContainsAny(password, model.NUMBERS) {
+				isError = true
+				id = id + "_number"
+			}
 		}
 
-		id = id + "_number"
-	}
-
-	if *settings.Symbol {
-		if !strings.ContainsAny(password, model.SYMBOLS) {
-			isError = true
+		if *settings.Symbol {
+			if !strings.ContainsAny(password, model.SYMBOLS) {
+				isError = true
+				id = id + "_symbol"
+			}
 		}
-
-		id = id + "_symbol"
 	}
 
 	if isError {

server/channels/app/users/password_test.go

@@ -107,7 +107,7 @@ func TestIsPasswordValidWithSettings(t *testing.T) {
 				Number:    model.NewPointer(true),
 				Symbol:    model.NewPointer(true),
 			},
-			ExpectedError: "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+			ExpectedError: "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
 		},
 		"Everything": {
 			Password: "asdASD!@#123",