#472 Require recovery code before resetting password

- /email recovery generates recovery code and resets password only if recovery code is also given
- Change data source method to return email and recovery code

src/main/java/fr/xephi/authme/datasource/CacheDataSource.java

@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.EmailRecoveryData;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.crypts.HashedPassword;
@@ -242,9 +243,8 @@ public class CacheDataSource implements DataSource {
     }
 
     @Override
-    public String getRecoveryCode(String name) {
-        // TODO #472: can probably get it from the cached Auth?
-        return source.getRecoveryCode(name);
+    public EmailRecoveryData getEmailRecoveryData(String name) {
+        return source.getEmailRecoveryData(name);
     }
 
     @Override