#567 Move email validation logic to validation service

src/main/java/fr/xephi/authme/util/Utils.java

@@ -7,9 +7,7 @@ import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.events.AuthMeTeleportEvent;
 import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.EmailSettings;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
@@ -21,7 +19,6 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * Utility class for various operations used in the codebase.
@@ -254,38 +251,12 @@ public final class Utils {
         }
     }
 
-    public static boolean isEmailCorrect(String email, NewSetting settings) {
-        if (!email.contains("@") || "your@email.com".equalsIgnoreCase(email)) {
-            return false;
-        }
-        final String emailDomain = email.split("@")[1];
-
-        List<String> whitelist = settings.getProperty(EmailSettings.DOMAIN_WHITELIST);
-        if (!CollectionUtils.isEmpty(whitelist)) {
-            return containsIgnoreCase(whitelist, emailDomain);
-        }
-
-        List<String> blacklist = settings.getProperty(EmailSettings.DOMAIN_BLACKLIST);
-        return CollectionUtils.isEmpty(blacklist) || !containsIgnoreCase(blacklist, emailDomain);
-    }
-
-    private static boolean containsIgnoreCase(Collection<String> coll, String needle) {
-        for (String entry : coll) {
-            if (entry.equalsIgnoreCase(needle)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public static String getUUIDorName(OfflinePlayer player) {
-        String uuidOrName;
         try {
-            uuidOrName = player.getUniqueId().toString();
+            return player.getUniqueId().toString();
         } catch (Exception ignore) {
-            uuidOrName = player.getName();
+            return player.getName();
         }
-        return uuidOrName;
     }
 
     public enum GroupType {

src/main/java/fr/xephi/authme/util/ValidationService.java

@@ -1,9 +1,17 @@
 package fr.xephi.authme.util;
 
+import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.command.CommandSender;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
  * Validation service.
@@ -11,9 +19,13 @@ import fr.xephi.authme.settings.properties.SecuritySettings;
 public class ValidationService {
 
     private final NewSetting settings;
+    private final DataSource dataSource;
+    private final PermissionsManager permissionsManager;
 
-    public ValidationService(NewSetting settings) {
+    public ValidationService(NewSetting settings, DataSource dataSource, PermissionsManager permissionsManager) {
         this.settings = settings;
+        this.dataSource = dataSource;
+        this.permissionsManager = permissionsManager;
     }
 
     /**
@@ -39,4 +51,33 @@ public class ValidationService {
         }
         return null;
     }
+
+    public boolean validateEmail(String email) {
+        if (!email.contains("@") || "your@email.com".equalsIgnoreCase(email)) {
+            return false;
+        }
+        final String emailDomain = email.split("@")[1];
+
+        List<String> whitelist = settings.getProperty(EmailSettings.DOMAIN_WHITELIST);
+        if (!CollectionUtils.isEmpty(whitelist)) {
+            return containsIgnoreCase(whitelist, emailDomain);
+        }
+
+        List<String> blacklist = settings.getProperty(EmailSettings.DOMAIN_BLACKLIST);
+        return CollectionUtils.isEmpty(blacklist) || !containsIgnoreCase(blacklist, emailDomain);
+    }
+
+    public boolean isEmailFreeForRegistration(String email, CommandSender sender) {
+        return permissionsManager.hasPermission(sender, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
+            || dataSource.countAuthsByEmail(email) < settings.getProperty(EmailSettings.MAX_REG_PER_EMAIL);
+    }
+
+    private static boolean containsIgnoreCase(Collection<String> coll, String needle) {
+        for (String entry : coll) {
+            if (entry.equalsIgnoreCase(needle)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }