diff --git a/src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java b/src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java index f3dbda7..19d4c77 100644 --- a/src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java +++ b/src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java @@ -13,7 +13,7 @@ import java.util.*; @Component public class RegRequestValidator implements Validator { - private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$"; + private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"]{1,200}$"; private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$"; @@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator { errors.rejectValue("companyName", "companyName.invalid.chars", "Company name contains invalid characters"); } - - validateForbiddenWords(trimmedCompany, "companyName", errors, - Arrays.asList("admin", "root", "system", "test")); - } - - private void validateForbiddenWords(String text, String fieldName, - Errors errors, List forbiddenWords) { - String lowerText = text.toLowerCase(); - for (String word : forbiddenWords) { - if (lowerText.contains(word)) { - errors.rejectValue(fieldName, fieldName + ".forbidden.word", - "Contains forbidden word: " + word); - break; - } - } } private void validateEmail(String email, Errors errors) {