Clarify pending logins methods

core/src/main/java/com/github/games647/fastlogin/core/CommonUtil.java

@@ -32,8 +32,8 @@ import org.slf4j.jul.JDK14LoggerAdapter;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.time.Duration;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public final class CommonUtil {
@@ -41,11 +41,11 @@ public final class CommonUtil {
     private static final char COLOR_CHAR = '&';
     private static final char TRANSLATED_CHAR = '§';
 
-    public static <K, V> ConcurrentMap<K, V> buildCache(int expireAfterWrite, int maxSize) {
+    public static <K, V> ConcurrentMap<K, V> buildCache(Duration expireAfterWrite, int maxSize) {
         CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
 
-        if (expireAfterWrite > 0) {
-            builder.expireAfterWrite(expireAfterWrite, TimeUnit.MINUTES);
+        if (expireAfterWrite != null) {
+            builder.expireAfterWrite(expireAfterWrite);
         }
 
         if (maxSize > 0) {

core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java

@@ -55,6 +55,7 @@ import java.net.Proxy.Type;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
@@ -78,7 +79,10 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     private static final long MAX_EXPIRE_RATE = 1_000_000;
 
     private final Map<String, String> localeMessages = new ConcurrentHashMap<>();
-    private final ConcurrentMap<String, Object> pendingLogin = CommonUtil.buildCache(5, -1);
+    private final ConcurrentMap<String, Object> pendingLogin = CommonUtil.buildCache(
+            Duration.ofMinutes(5), -1
+    );
+
     private final Collection<UUID> pendingConfirms = new HashSet<>();
     private final T plugin;
 
@@ -272,8 +276,16 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         this.passwordGenerator = passwordGenerator;
     }
 
-    public ConcurrentMap<String, Object> getPendingLogin() {
-        return pendingLogin;
+    public void addLoginAttempt(String ip, String username) {
+        pendingLogin.put(ip + username, new Object());
+    }
+
+    public boolean hasFailedLogin(String ip, String username) {
+        if (!config.get("secondAttemptCracked", false)) {
+            return false;
+        }
+
+        return pendingLogin.remove(ip + username) != null;
     }
 
     public Collection<UUID> getPendingConfirms() {
@@ -284,7 +296,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return authPlugin;
     }
 
-    public AntiBotService getAntiBot() {
+    public AntiBotService getAntiBotService() {
         return antiBot;
     }
 

core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java

@@ -48,8 +48,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
     }
 
     public void onLogin(String username, S source) {
-        core.getPlugin().getLog().info("Handling player {}", username);
-
         //check if the player is connecting through Bedrock Edition
         if (bedrockService != null && bedrockService.isBedrockConnection(username)) {
             //perform Bedrock specific checks and skip Java checks if no longer needed
@@ -59,7 +57,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         }
 
         StoredProfile profile = core.getStorage().loadProfile(username);
-
         //can't be a premium Java player, if it's not saved in the database
         if (profile == null) {
             return;
@@ -78,7 +75,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         }
 
         callFastLoginPreLoginEvent(username, source, profile);
-
         Configuration config = core.getConfig();
 
         String ip = source.getAddress().getAddress().getHostAddress();
@@ -94,7 +90,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
                     }
                 }
             } else {
-                if (core.getPendingLogin().remove(ip + username) != null && config.get("secondAttemptCracked", false)) {
+                if (core.hasFailedLogin(ip, username)) {
                     core.getPlugin().getLog().info("Second attempt login -> cracked {}", username);
 
                     //first login request failed so make a cracked session
@@ -124,7 +120,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
                 + " server issued more than 600 Name -> UUID requests within 10 minutes. After those 10"
                 + " minutes we can make requests again.", username);
         } catch (Exception ex) {
-            core.getPlugin().getLog().error("Failed to check premium state for {}", username, ex);
             core.getPlugin().getLog().error("Failed to check premium state of {}", username, ex);
         }
     }