#358 Handle hash + salt as one "unit"

- Rename HashResult to EncryptedPassword to reflect its broader use
- Use EncryptedPassword in methods that require the hash and the salt, instead of passing them as strings separately
- Store EncryptedPassword as field in PlayerAuth; updatePassword() thus processes the entire data in the EncryptedPassword object

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

@@ -7,7 +7,7 @@ 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.security.crypts.HashResult;
+import fr.xephi.authme.security.crypts.EncryptedPassword;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.command.CommandSender;
 
@@ -68,11 +68,9 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
                 }
 
                 // TODO #358: Do we always pass lowercase name?? In that case we need to do that in PasswordSecurity!
-                HashResult hashResult = commandService.getPasswordSecurity().computeHash(playerPass, playerNameLowerCase);
-                auth.setHash(hashResult.getHash());
-                auth.setSalt(hashResult.getSalt());
+                EncryptedPassword encryptedPassword = commandService.getPasswordSecurity().computeHash(playerPass, playerNameLowerCase);
+                auth.setPassword(encryptedPassword);
 
-                // TODO #358: updatePassword(auth) needs to update the salt, too.
                 if (!dataSource.updatePassword(auth)) {
                     commandService.send(sender, MessageKey.ERROR);
                 } else {

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

@@ -5,7 +5,7 @@ import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
-import fr.xephi.authme.security.crypts.HashResult;
+import fr.xephi.authme.security.crypts.EncryptedPassword;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -57,13 +57,12 @@ public class RegisterAdminCommand implements ExecutableCommand {
                     commandService.send(sender, MessageKey.NAME_ALREADY_REGISTERED);
                     return;
                 }
-                HashResult hashResult = commandService.getPasswordSecurity()
+                EncryptedPassword encryptedPassword = commandService.getPasswordSecurity()
                     .computeHash(playerPass, playerNameLowerCase);
                 PlayerAuth auth = PlayerAuth.builder()
                     .name(playerNameLowerCase)
                     .realName(playerName)
-                    .hash(hashResult.getHash())
-                    .salt(hashResult.getSalt())
+                    .hash(encryptedPassword)
                     .build();
 
                 if (!commandService.getDataSource().saveAuth(auth)) {

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.security.RandomString;
-import fr.xephi.authme.security.crypts.HashResult;
+import fr.xephi.authme.security.crypts.EncryptedPassword;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.StringUtils;
 import org.bukkit.entity.Player;
@@ -37,7 +37,7 @@ public class RecoverEmailCommand extends PlayerCommand {
             }
 
             String thePass = RandomString.generate(Settings.getRecoveryPassLength);
-            HashResult hashNew = commandService.getPasswordSecurity().computeHash(thePass, playerName);
+            EncryptedPassword hashNew = commandService.getPasswordSecurity().computeHash(thePass, playerName);
             PlayerAuth auth;
             if (PlayerCache.getInstance().isAuthenticated(playerName)) {
                 auth = PlayerCache.getInstance().getAuth(playerName);
@@ -57,8 +57,7 @@ public class RecoverEmailCommand extends PlayerCommand {
                 commandService.send(player, MessageKey.INVALID_EMAIL);
                 return;
             }
-            auth.setHash(hashNew.getHash());
-            auth.setSalt(hashNew.getSalt());
+            auth.setPassword(hashNew);
             dataSource.updatePassword(auth);
             plugin.mail.main(auth, thePass);
             commandService.send(player, MessageKey.RECOVERY_EMAIL_SENT_MESSAGE);