Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FSADT1-982: Discrepancy in email validation #600

Merged
merged 5 commits into from
Nov 9, 2023
Merged

FSADT1-982: Discrepancy in email validation #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0d7160
Merge branch 'main' into fix/FSADT1-982
mamartinezmejia Nov 9, 2023
cf61e4a
fix: Aligned FE validation with BE validation
mamartinezmejia Nov 9, 2023
302653f
Merge branch 'main' into fix/FSADT1-982
paulushcgcj Nov 9, 2023
c635cb2
chore: rearranging imports
paulushcgcj Nov 9, 2023
868c6cf
fix: removing dependency with security issues
paulushcgcj Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
Expand Down
11 changes: 7 additions & 4 deletions backend/src/main/java/ca/bc/gov/app/util/ClientValidationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@

import ca.bc.gov.app.dto.client.ClientTypeEnum;
import ca.bc.gov.app.dto.client.LegalTypeEnum;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
import org.springframework.validation.Errors;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ClientValidationUtils {

private static final EmailValidator emailValidator = EmailValidator.getInstance();
private static final String EMAIL_REGEX = "^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$";
private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);

public static void validateEmail(String email, String field, Errors errors) {
if (StringUtils.isBlank(email)) {
errors.rejectValue(field, "You must enter an email address");
return;
}

if (!emailValidator.isValid(email)) {
Matcher emailMatcher = EMAIL_PATTERN.matcher(email);
if (!emailMatcher.matches()) {
errors.rejectValue(field, "You must enter an email address in a valid format. "
+ "For example: [email protected]");
+ "For example: [email protected]");
}
}

Expand Down
Loading