#830 Unify unregister process flavors

src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java

@@ -1,13 +1,9 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 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.Management;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.command.CommandSender;
@@ -27,47 +23,27 @@ public class UnregisterAdminCommand implements ExecutableCommand {
     @Inject
     private CommandService commandService;
 
-    @Inject
-    private PlayerCache playerCache;
-
     @Inject
     private BukkitService bukkitService;
 
-    @Inject
-    private AuthGroupHandler authGroupHandler;
-
     @Inject
     private Management management;
 
+    UnregisterAdminCommand() {
+    }
 
     @Override
     public void executeCommand(final CommandSender sender, List<String> arguments) {
-        // Get the player name
         String playerName = arguments.get(0);
-        String playerNameLowerCase = playerName.toLowerCase();
 
-        // Make sure the user is valid
-        if (!dataSource.isAuthAvailable(playerNameLowerCase)) {
+        // Make sure the user exists
+        if (!dataSource.isAuthAvailable(playerName)) {
             commandService.send(sender, MessageKey.UNKNOWN_USER);
             return;
         }
 
-        // Remove the player
-        if (!dataSource.removeAuth(playerNameLowerCase)) {
-            commandService.send(sender, MessageKey.ERROR);
-            return;
-        }
-
-        // Unregister the player
-        Player target = bukkitService.getPlayerExact(playerNameLowerCase);
-        playerCache.removePlayer(playerNameLowerCase);
-        authGroupHandler.setGroup(target, AuthGroupType.UNREGISTERED);
-        if (target != null && target.isOnline()) {
-            management.performUnregister(target, "dontneed", true);
-        }
-
-        // Show a status message
-        commandService.send(sender, MessageKey.UNREGISTERED_SUCCESS);
-        ConsoleLogger.info(sender.getName() + " unregistered " + playerName);
+        // Get the player from the server and perform unregister
+        Player target = bukkitService.getPlayerExact(playerName);
+        management.performUnregisterByAdmin(sender, playerName, target);
     }
 }

src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java

@@ -10,6 +10,9 @@ import org.bukkit.entity.Player;
 import javax.inject.Inject;
 import java.util.List;
 
+/**
+ * Command for a player to unregister himself.
+ */
 public class UnregisterCommand extends PlayerCommand {
 
     @Inject
@@ -24,15 +27,15 @@ public class UnregisterCommand extends PlayerCommand {
     @Override
     public void runCommand(Player player, List<String> arguments) {
         String playerPass = arguments.get(0);
-        final String playerNameLowerCase = player.getName().toLowerCase();
+        final String playerName = player.getName();
 
         // Make sure the player is authenticated
-        if (!playerCache.isAuthenticated(playerNameLowerCase)) {
+        if (!playerCache.isAuthenticated(playerName)) {
             commandService.send(player, MessageKey.NOT_LOGGED_IN);
             return;
         }
 
         // Unregister the player
-        management.performUnregister(player, playerPass, false);
+        management.performUnregister(player, playerPass);
     }
 }