#1141 2FA implementation fixes

- Merge TotpService into TotpAuthenticator
- Add missing tests
- Migrate old 2fa enabled key to new one

src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.security.totp;
 
 import com.warrenstrange.googleauth.IGoogleAuthenticator;
+import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult;
 import fr.xephi.authme.service.BukkitService;
 import org.bukkit.entity.Player;
@@ -86,6 +87,25 @@ public class TotpAuthenticatorTest {
         verifyZeroInteractions(googleAuthenticator);
     }
 
+    @Test
+    public void shouldVerifyCode() {
+        // given
+        String totpKey = "ASLO43KDF2J";
+        PlayerAuth auth = PlayerAuth.builder()
+            .name("Maya")
+            .totpKey(totpKey)
+            .build();
+        String inputCode = "408435";
+        given(totpAuthenticator.checkCode(totpKey, inputCode)).willReturn(true);
+
+        // when
+        boolean result = totpAuthenticator.checkCode(auth, inputCode);
+
+        // then
+        assertThat(result, equalTo(true));
+        verify(googleAuthenticator).authorize(totpKey, 408435);
+    }
+
     private final class TotpAuthenticatorTestImpl extends TotpAuthenticator {
 
         TotpAuthenticatorTestImpl(BukkitService bukkitService) {

src/test/java/fr/xephi/authme/security/totp/TotpServiceTest.java

@@ -1,46 +0,0 @@
-package fr.xephi.authme.security.totp;
-
-import fr.xephi.authme.data.auth.PlayerAuth;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-
-/**
- * Test for {@link TotpService}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class TotpServiceTest {
-
-    @InjectMocks
-    private TotpService totpService;
-
-    @Mock
-    private TotpAuthenticator totpAuthenticator;
-
-    @Test
-    public void shouldVerifyCode() {
-        // given
-        String totpKey = "ASLO43KDF2J";
-        PlayerAuth auth = PlayerAuth.builder()
-            .name("Maya")
-            .totpKey(totpKey)
-            .build();
-        String inputCode = "408435";
-        given(totpAuthenticator.checkCode(totpKey, inputCode)).willReturn(true);
-
-        // when
-        boolean result = totpService.verifyCode(auth, inputCode);
-
-        // then
-        assertThat(result, equalTo(true));
-        verify(totpAuthenticator).checkCode(totpKey, inputCode);
-    }
-
-}