WIP: revert changes entirely

moneymeets · Jun 18, 2024 · a0a2199 · a0a2199
1 parent d2454fd
commit a0a2199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/server-spi-private/src/main/java/org/keycloak/validate/validators/EmailValidator.java b/server-spi-private/src/main/java/org/keycloak/validate/validators/EmailValidator.java
@@ -21,6 +21,7 @@
 
 import org.keycloak.provider.ConfiguredProvider;
 import org.keycloak.provider.ProviderConfigProperty;
+import org.keycloak.utils.EmailValidationUtil;
 import org.keycloak.validate.AbstractStringValidator;
 import org.keycloak.validate.ValidationContext;
 import org.keycloak.validate.ValidationError;
@@ -47,7 +48,7 @@ public String getId() {
 
     @Override
     protected void doValidate(String value, String inputHint, ValidationContext context, ValidatorConfig config) {
-        if (!JMail.isValid(value)) {
+        if (!EmailValidationUtil.isValidEmail(value)) {
             context.addError(new ValidationError(ID, inputHint, MESSAGE_INVALID_EMAIL, value));
         }
     }

diff --git a/services/src/main/java/org/keycloak/services/validation/Validation.java b/services/src/main/java/org/keycloak/services/validation/Validation.java
@@ -18,6 +18,7 @@
 package org.keycloak.services.validation;
 
 import com.sanctionco.jmail.JMail;
+import org.hazlewood.connor.bottema.emailaddress.EmailAddressValidator;
 import org.keycloak.models.utils.FormMessage;
 import org.keycloak.userprofile.ValidationException;
 
@@ -62,7 +63,7 @@ public static boolean isBlank(String s) {
     }
 
     public static boolean isEmailValid(String email) {
-        return JMail.isValid(email);
+        return EmailAddressValidator.isValidStrict(email);
     }
 
     public static boolean isUsernameValid(String username) {