Update docs / update recovery code command in email message

- Update docs to reflect new commands, configurations (account recovery, limbo handling) and messages
- Change message for the recovery code email to contain the new command
This commit is contained in:
ljacqu
2017-03-22 23:14:02 +01:00
parent ce40b3798b
commit e77828b228
6 changed files with 75 additions and 46 deletions
@@ -287,8 +287,8 @@ public class CommandInitializer {
.labels("converter", "convert", "conv")
.description("Converter command")
.detailedDescription("Converter command for AuthMeReloaded.")
.withArgument("job", "Conversion job: xauth / crazylogin / rakamak / " +
"royalauth / vauth / sqliteToSql / mysqlToSqlite", false)
.withArgument("job", "Conversion job: xauth / crazylogin / rakamak / "
+ "royalauth / vauth / sqliteToSql / mysqlToSqlite", false)
.permission(AdminPermission.CONVERTER)
.executableCommand(ConverterCommand.class)
.register();
@@ -418,8 +418,8 @@ public class CommandInitializer {
.parent(EMAIL_BASE)
.labels("recover", "recovery", "recoveremail", "recovermail")
.description("Recover password using email")
.detailedDescription("Recover your account using an Email address by sending a mail containing " +
"a new password.")
.detailedDescription("Recover your account using an Email address by sending a mail containing "
+ "a new password.")
.withArgument("email", "Email address", false)
.permission(PlayerPermission.RECOVER_EMAIL)
.executableCommand(RecoverEmailCommand.class)
@@ -430,7 +430,7 @@ public class CommandInitializer {
.parent(EMAIL_BASE)
.labels("code")
.description("Submit code to recover password")
.detailedDescription("Recover your account by submitting an emailed code to your email.")
.detailedDescription("Recover your account by submitting a code delivered to your email.")
.withArgument("code", "Recovery code", false)
.permission(PlayerPermission.RECOVER_EMAIL)
.executableCommand(ProcessCodeCommand.class)
@@ -30,9 +30,6 @@ public class PasswordRecoveryService implements Reloadable {
@Inject
private CommonService commonService;
@Inject
private RecoveryCodeService codeService;
@Inject
private DataSource dataSource;
@@ -129,7 +126,7 @@ public class PasswordRecoveryService implements Reloadable {
* @param player The player to check.
* @return True if the player is not on cooldown.
*/
public boolean checkEmailCooldown(Player player) {
private boolean checkEmailCooldown(Player player) {
Duration waitDuration = emailCooldown.getExpiration(player.getName().toLowerCase());
if (waitDuration.getDuration() > 0) {
String durationText = messages.formatDuration(waitDuration);
+1 -1
View File
@@ -2,7 +2,7 @@
<p>
You have requested to reset your password on <servername />. To reset it,
please use the recovery code <recoverycode />: /email recover [email] <recoverycode />.
please use the recovery code <recoverycode />: /email code <recoverycode />.
</p>
<p>
The code expires in <hoursvalid /> hours.