X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2FdbObjects%2FSupportedUser.java;h=1eae478f6a0eb872a03f8a14682f84958ab1e529;hb=7a5f2a2674900b80847ab77bb1ace1b53215f4b9;hp=5d023e9bbb68a90ea612fd47d3e659199cb86e44;hpb=628b0bb70786afe5de5ba28a8438261dc31e25a6;p=gigi.git diff --git a/src/club/wpia/gigi/dbObjects/SupportedUser.java b/src/club/wpia/gigi/dbObjects/SupportedUser.java index 5d023e9b..1eae478f 100644 --- a/src/club/wpia/gigi/dbObjects/SupportedUser.java +++ b/src/club/wpia/gigi/dbObjects/SupportedUser.java @@ -70,7 +70,7 @@ public class SupportedUser { // TODO Check for open jobs! if (cert.getStatus() == CertificateStatus.ISSUED) { writeSELog("SE Revoke certificate"); - cert.revoke(RevocationType.SUPPORT).waitFor(60000); + cert.revoke(RevocationType.SUPPORT).waitFor(Job.WAIT_MIN); // send notification to support String subject = "Revoke certificate"; Outputable message = SprintfCommand.createSimple("Certificate with serial number {0} for {1} <{2}> has been revoked.", cert.getSerial(), target.getPreferredName().toString(), target.getEmail()); @@ -175,13 +175,14 @@ public class SupportedUser { } } - public void triggerPasswordReset(String aword, HttpServletRequest req) { + public void triggerPasswordReset(String aword, HttpServletRequest req) throws GigiApiException { Language l = Language.getInstance(target.getPreferredLocale()); String method = l.getTranslation("A password reset was triggered. Please enter the required text sent to you by support on this page:"); String subject = l.getTranslation("Password reset by support."); PasswordResetPage.initPasswordResetProcess(target, req, aword, l, method, subject); Outputable message = new TranslateCommand("A password reset was triggered and an email was sent to user."); sendSupportNotification(subject, message); + writeSELog("SE triggered password reset"); } private void sendBoardNotification(String subject, Outputable message) {