#830 Unify unregister process flavors

src/main/java/fr/xephi/authme/process/Management.java

@@ -10,6 +10,7 @@ import fr.xephi.authme.process.quit.AsynchronousQuit;
 import fr.xephi.authme.process.register.AsyncRegister;
 import fr.xephi.authme.process.unregister.AsynchronousUnregister;
 import fr.xephi.authme.util.BukkitService;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -70,11 +71,20 @@ public class Management {
         });
     }
 
-    public void performUnregister(final Player player, final String password, final boolean isForce) {
+    public void performUnregister(final Player player, final String password) {
         runTask(new Runnable() {
             @Override
             public void run() {
-                asynchronousUnregister.unregister(player, password, isForce);
+                asynchronousUnregister.unregister(player, password);
+            }
+        });
+    }
+
+    public void performUnregisterByAdmin(final CommandSender initiator, final String name, final Player player) {
+        runTask(new Runnable() {
+            @Override
+            public void run() {
+                asynchronousUnregister.adminUnregister(initiator, name, player);
             }
         });
     }

src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java

@@ -6,16 +6,17 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.permission.AuthGroupHandler;
 import fr.xephi.authme.permission.AuthGroupType;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.task.PlayerDataTaskManager;
 import fr.xephi.authme.util.BukkitService;
 import fr.xephi.authme.util.TeleportationService;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -39,7 +40,7 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     private PlayerCache playerCache;
 
     @Inject
-    private BukkitService bukktiService;
+    private BukkitService bukkitService;
 
     @Inject
     private LimboCache limboCache;
@@ -50,51 +51,79 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     @Inject
     private TeleportationService teleportationService;
 
+    @Inject
+    private AuthGroupHandler authGroupHandler;
+
     AsynchronousUnregister() { }
 
-
-    public void unregister(Player player, String password, boolean force) {
-        final String name = player.getName().toLowerCase();
-        PlayerAuth cachedAuth = playerCache.getAuth(name);
-        if (force || passwordSecurity.comparePassword(password, cachedAuth.getPassword(), player.getName())) {
-            if (!dataSource.removeAuth(name)) {
+    /**
+     * Processes a player's request to unregister himself. Unregisters the player after
+     * successful password check.
+     *
+     * @param player the player
+     * @param password the input password to check before unregister
+     */
+    public void unregister(Player player, String password) {
+        final String name = player.getName();
+        final PlayerAuth cachedAuth = playerCache.getAuth(name);
+        if (passwordSecurity.comparePassword(password, cachedAuth.getPassword(), name)) {
+            if (dataSource.removeAuth(name)) {
+                performUnregister(name, player);
+                ConsoleLogger.info(name + " unregistered himself");
+            } else {
                 service.send(player, MessageKey.ERROR);
-                return;
             }
-
-            if (service.getProperty(RegistrationSettings.FORCE)) {
-                teleportationService.teleportOnJoin(player);
-                player.saveData();
-                playerCache.removePlayer(player.getName().toLowerCase());
-                if (!service.getProperty(HooksSettings.REGISTERED_GROUP).isEmpty()) {
-                    service.setGroup(player, AuthGroupType.UNREGISTERED);
-                }
-                limboCache.deletePlayerData(player);
-                limboCache.addPlayerData(player);
-                playerDataTaskManager.registerTimeoutTask(player);
-                playerDataTaskManager.registerMessageTask(name, false);
-
-                service.send(player, MessageKey.UNREGISTERED_SUCCESS);
-                applyBlindEffect(player);
-                ConsoleLogger.info(player.getName() + " unregistered himself");
-                return; // TODO ljacqu 20160612: Why return here? No blind effect? Player not removed from PlayerCache?
-            }
-            if (!service.getProperty(HooksSettings.UNREGISTERED_GROUP).isEmpty()) {
-                service.setGroup(player, AuthGroupType.UNREGISTERED);
-            }
-            playerCache.removePlayer(name);
-
-            service.send(player, MessageKey.UNREGISTERED_SUCCESS);
-            ConsoleLogger.info(player.getName() + " unregistered himself");
         } else {
             service.send(player, MessageKey.WRONG_PASSWORD);
         }
     }
 
+    /**
+     * Unregisters a player.
+     *
+     * @param initiator the initiator of this process (nullable)
+     * @param name the name of the player
+     * @param player the according Player object (nullable)
+     */
+    // We need to have the name and the player separate because Player might be null in this case:
+    // we might have some player in the database that has never been online on the server
+    public void adminUnregister(CommandSender initiator, String name, Player player) {
+        if (dataSource.removeAuth(name)) {
+            performUnregister(name, player);
+            if (initiator == null) {
+                ConsoleLogger.info(name + " was unregistered");
+            } else {
+                ConsoleLogger.info(name + " was unregistered by " + initiator.getName());
+                service.send(initiator, MessageKey.UNREGISTERED_SUCCESS);
+            }
+        }
+    }
+
+    private void performUnregister(String name, Player player) {
+        playerCache.removePlayer(name);
+        if (player == null || !player.isOnline()) {
+            return;
+        }
+
+        if (service.getProperty(RegistrationSettings.FORCE)) {
+            teleportationService.teleportOnJoin(player);
+            player.saveData();
+
+            limboCache.deletePlayerData(player);
+            limboCache.addPlayerData(player);
+
+            playerDataTaskManager.registerTimeoutTask(player);
+            playerDataTaskManager.registerMessageTask(name, false);
+            applyBlindEffect(player);
+        }
+        authGroupHandler.setGroup(player, AuthGroupType.UNREGISTERED);
+        service.send(player, MessageKey.UNREGISTERED_SUCCESS);
+    }
+
     private void applyBlindEffect(final Player player) {
         if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
             final int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
-            bukktiService.runTask(new Runnable() {
+            bukkitService.runTask(new Runnable() {
                 @Override
                 public void run() {
                     player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));