#930 Register captcha: avoid circular dependency by handling limbo message in captcha command
- Set limbo message in captcha command (as is done for login captcha) - Add clarifying comments to captcha command - Remove classes handling circular dependencies
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
package fr.xephi.authme.data.captcha;
|
||||
|
||||
import fr.xephi.authme.data.limbo.LimboService;
|
||||
import fr.xephi.authme.initialization.HasCleanup;
|
||||
import fr.xephi.authme.initialization.SettingsDependent;
|
||||
import fr.xephi.authme.initialization.circulardependency.HasCircularDependency;
|
||||
import fr.xephi.authme.initialization.circulardependency.InjectAfterInitialization;
|
||||
import fr.xephi.authme.settings.Settings;
|
||||
import fr.xephi.authme.settings.properties.SecuritySettings;
|
||||
import fr.xephi.authme.util.expiring.ExpiringSet;
|
||||
@@ -16,13 +13,10 @@ import java.util.concurrent.TimeUnit;
|
||||
/**
|
||||
* Captcha manager for registration.
|
||||
*/
|
||||
public class RegistrationCaptchaManager
|
||||
implements CaptchaManager, SettingsDependent, HasCleanup, HasCircularDependency {
|
||||
public class RegistrationCaptchaManager implements CaptchaManager, SettingsDependent, HasCleanup {
|
||||
|
||||
private static final int MINUTES_VALID_FOR_REGISTRATION = 30;
|
||||
|
||||
private LimboService limboService;
|
||||
|
||||
private final ExpiringSet<String> verifiedNamesForRegistration;
|
||||
private final CaptchaCodeStorage captchaCodeStorage;
|
||||
private boolean isEnabled;
|
||||
@@ -52,7 +46,6 @@ public class RegistrationCaptchaManager
|
||||
if (isCodeCorrect) {
|
||||
verifiedNamesForRegistration.add(nameLower);
|
||||
}
|
||||
limboService.resetMessageTask(player, false);
|
||||
return isCodeCorrect;
|
||||
}
|
||||
|
||||
@@ -69,9 +62,4 @@ public class RegistrationCaptchaManager
|
||||
verifiedNamesForRegistration.removeExpiredEntries();
|
||||
captchaCodeStorage.removeExpiredEntries();
|
||||
}
|
||||
|
||||
@InjectAfterInitialization
|
||||
public void setLimboService(LimboService limboService) {
|
||||
this.limboService = limboService;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user