Merge branch '1347-change-password-api' of https://github.com/AuthMe/AuthMeReloaded

src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java

@@ -285,6 +285,16 @@ public class AuthMeApi {
         management.performUnregisterByAdmin(null, name, Bukkit.getPlayer(name));
     }
 
+    /**
+     * Change a user's password
+     *
+     * @param name the user name
+     * @param newPassword the new password
+     */
+    public void changePassword(String name, String newPassword) {
+        management.performPasswordChangeAsAdmin(null, name, newPassword);
+    }
+
     /**
      * Get all the registered names (lowercase)
      *

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

@@ -1,13 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.data.auth.PlayerCache;
-import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.security.crypts.HashedPassword;
-import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.ValidationService.ValidationResult;
@@ -21,26 +15,17 @@ import java.util.List;
  */
 public class ChangePasswordAdminCommand implements ExecutableCommand {
 
-    @Inject
-    private PasswordSecurity passwordSecurity;
-
-    @Inject
-    private PlayerCache playerCache;
-
-    @Inject
-    private DataSource dataSource;
-
-    @Inject
-    private BukkitService bukkitService;
-
     @Inject
     private ValidationService validationService;
 
     @Inject
     private CommonService commonService;
 
+    @Inject
+    private Management management;
+
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments) {
         // Get the player and password
         final String playerName = arguments.get(0);
         final String playerPass = arguments.get(1);
@@ -49,36 +34,8 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
         ValidationResult validationResult = validationService.validatePassword(playerPass, playerName);
         if (validationResult.hasError()) {
             commonService.send(sender, validationResult.getMessageKey(), validationResult.getArgs());
-            return;
-        }
-
-        // Set the password
-        bukkitService.runTaskOptionallyAsync(() -> changePassword(playerName.toLowerCase(), playerPass, sender));
-    }
-
-    /**
-     * Changes the password of the given player to the given password.
-     *
-     * @param nameLowercase the name of the player
-     * @param password the password to set
-     * @param sender the sender initiating the password change
-     */
-    private void changePassword(String nameLowercase, String password, CommandSender sender) {
-        if (!isNameRegistered(nameLowercase)) {
-            commonService.send(sender, MessageKey.UNKNOWN_USER);
-            return;
-        }
-
-        HashedPassword hashedPassword = passwordSecurity.computeHash(password, nameLowercase);
-        if (dataSource.updatePassword(nameLowercase, hashedPassword)) {
-            commonService.send(sender, MessageKey.PASSWORD_CHANGED_SUCCESS);
-            ConsoleLogger.info(sender.getName() + " changed password of " + nameLowercase);
         } else {
-            commonService.send(sender, MessageKey.ERROR);
+            management.performPasswordChangeAsAdmin(sender, playerName, playerPass);
         }
     }
-
-    private boolean isNameRegistered(String nameLowercase) {
-        return playerCache.isAuthenticated(nameLowercase) || dataSource.isAuthAvailable(nameLowercase);
-    }
 }

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

@@ -94,6 +94,10 @@ public class Management {
         runTask(() -> asyncChangePassword.changePassword(player, oldPassword, newPassword));
     }
 
+    public void performPasswordChangeAsAdmin(CommandSender sender, String playerName, String newPassword) {
+        runTask(() -> asyncChangePassword.changePasswordAsAdmin(sender, playerName, newPassword));
+    }
+
     private void runTask(Runnable runnable) {
         bukkitService.runTaskOptionallyAsync(runnable);
     }

src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java

@@ -9,6 +9,7 @@ import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -30,7 +31,13 @@ public class AsyncChangePassword implements AsynchronousProcess {
     AsyncChangePassword() {
     }
 
-
+    /**
+     * Change password for an online player
+     *
+     * @param player the player
+     * @param oldPassword the old password used by the player
+     * @param newPassword the new password chosen by the player
+     */
     public void changePassword(final Player player, String oldPassword, String newPassword) {
         final String name = player.getName().toLowerCase();
         PlayerAuth auth = playerCache.getAuth(name);
@@ -50,5 +57,38 @@ public class AsyncChangePassword implements AsynchronousProcess {
             commonService.send(player, MessageKey.WRONG_PASSWORD);
         }
     }
-}
 
+    /**
+     * Change a user's password as an administrator, without asking for the previous one
+     *
+     * @param sender who is performing the operation, null if called by other plugins
+     * @param playerName the player name
+     * @param newPassword the new password chosen for the player
+     */
+    public void changePasswordAsAdmin(CommandSender sender, final String playerName, String newPassword) {
+        final String lowerCaseName = playerName.toLowerCase();
+        if (!(playerCache.isAuthenticated(lowerCaseName) || dataSource.isAuthAvailable(lowerCaseName))) {
+            if (sender == null) {
+                ConsoleLogger.warning("Tried to change password for user " + lowerCaseName + " but it doesn't exist!");
+            } else {
+                commonService.send(sender, MessageKey.UNKNOWN_USER);
+            }
+            return;
+        }
+
+        HashedPassword hashedPassword = passwordSecurity.computeHash(newPassword, lowerCaseName);
+        if (dataSource.updatePassword(lowerCaseName, hashedPassword)) {
+            if (sender != null) {
+                commonService.send(sender, MessageKey.PASSWORD_CHANGED_SUCCESS);
+                ConsoleLogger.info(sender.getName() + " changed password of " + lowerCaseName);
+            } else {
+                ConsoleLogger.info("Changed password of " + lowerCaseName);
+            }
+        } else {
+            if (sender != null) {
+                commonService.send(sender, MessageKey.ERROR);
+            }
+            ConsoleLogger.warning("An error occurred while changing password for user " + lowerCaseName + "!");
+        }
+    }
+}