#1141 Split TOTP permissions for add/remove, refactor TOTP services

- Split TotpService further into GenerateTotpService and TotpAuthenticator, which wraps the GoogleAuthenticator impl
- Add missing tests for the services
- Change GenerateTotpService's interface to behave like a collection for more intuitive method behavior

src/main/java/fr/xephi/authme/command/executable/totp/AddTotpCommand.java

@@ -4,8 +4,8 @@ import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.security.TotpService;
-import fr.xephi.authme.security.TotpService.TotpGenerationResult;
+import fr.xephi.authme.security.totp.GenerateTotpService;
+import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -19,7 +19,7 @@ import java.util.List;
 public class AddTotpCommand extends PlayerCommand {
 
     @Inject
-    private TotpService totpService;
+    private GenerateTotpService generateTotpService;
 
     @Inject
     private DataSource dataSource;
@@ -31,7 +31,7 @@ public class AddTotpCommand extends PlayerCommand {
     protected void runCommand(Player player, List<String> arguments) {
         PlayerAuth auth = dataSource.getAuth(player.getName());
         if (auth.getTotpKey() == null) {
-            TotpGenerationResult createdTotpInfo = totpService.generateTotpKey(player);
+            TotpGenerationResult createdTotpInfo = generateTotpService.generateTotpKey(player);
             commonService.send(player, MessageKey.TWO_FACTOR_CREATE,
                 createdTotpInfo.getTotpKey(), createdTotpInfo.getAuthenticatorQrCodeUrl());
         } else {

src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java

@@ -2,7 +2,8 @@ package fr.xephi.authme.command.executable.totp;
 
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.security.TotpService;
+import fr.xephi.authme.security.totp.GenerateTotpService;
+import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -14,7 +15,7 @@ import java.util.List;
 public class ConfirmTotpCommand extends PlayerCommand {
 
     @Inject
-    private TotpService totpService;
+    private GenerateTotpService generateTotpService;
 
     @Inject
     private DataSource dataSource;
@@ -23,13 +24,14 @@ public class ConfirmTotpCommand extends PlayerCommand {
     protected void runCommand(Player player, List<String> arguments) {
         // TODO #1141: Check if player already has TOTP
 
-        final String totpKey = totpService.retrieveGeneratedSecret(player);
-        if (totpKey == null) {
+        final TotpGenerationResult totpDetails = generateTotpService.getGeneratedTotpKey(player);
+        if (totpDetails == null) {
             player.sendMessage("No TOTP key has been generated for you or it has expired. Please run /totp add");
         } else {
-            boolean isTotpCodeValid = totpService.confirmCodeForGeneratedTotpKey(player, arguments.get(0));
-            if (isTotpCodeValid) {
-                dataSource.setTotpKey(player.getName(), totpKey);
+            boolean isCodeValid = generateTotpService.isTotpCodeCorrectForGeneratedTotpKey(player, arguments.get(0));
+            if (isCodeValid) {
+                generateTotpService.removeGenerateTotpKey(player);
+                dataSource.setTotpKey(player.getName(), totpDetails.getTotpKey());
                 player.sendMessage("Successfully enabled two-factor authentication for your account");
             } else {
                 player.sendMessage("Wrong code or code has expired. Please use /totp add again");

src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java

@@ -3,7 +3,7 @@ package fr.xephi.authme.command.executable.totp;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.security.TotpService;
+import fr.xephi.authme.security.totp.TotpService;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;