This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new ad1dd4e92 [OPENMEETINGS-2733] some Sonar issues ad1dd4e92 is described below commit ad1dd4e92449af6617a78e4c4978baebeff90a33 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Tue Dec 27 12:26:33 2022 +0700 [OPENMEETINGS-2733] some Sonar issues --- .../java/org/apache/openmeetings/web/app/OtpManager.java | 16 ++++++++-------- .../org/apache/openmeetings/web/pages/NotInitedPage.html | 1 - .../apache/openmeetings/web/pages/auth/OtpDialog.java | 1 + .../web/user/profile/MessagesContactsPanel.html | 1 - .../openmeetings/web/user/profile/ToggleOtpDialog.html | 2 +- .../openmeetings/web/user/profile/UserSearchPanel.html | 1 - 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java index 8715cde17..73f220e67 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java @@ -52,9 +52,9 @@ import dev.samstevens.totp.time.NtpTimeProvider; public class OtpManager { private static final Logger log = LoggerFactory.getLogger(OtpManager.class); // these properties are hardcoded into Google Authenticator :( - private static final int digits = 6; - private static final int period = 30; - private static final HashingAlgorithm alg = HashingAlgorithm.SHA1; + private static final int DIGITS = 6; + private static final int PERIOD = 30; + private static final HashingAlgorithm ALGORITHM = HashingAlgorithm.SHA1; private final SecretGenerator secretGenerator = new DefaultSecretGenerator(128); private CodeGenerator codeGenerator; @@ -68,9 +68,9 @@ public class OtpManager { @PostConstruct public void init() throws UnknownHostException { - codeGenerator = new DefaultCodeGenerator(alg, digits); + codeGenerator = new DefaultCodeGenerator(ALGORITHM, DIGITS); final DefaultCodeVerifier verifier = new DefaultCodeVerifier(codeGenerator, new NtpTimeProvider(ntpServer, ntpTimeout)); - verifier.setTimePeriod(period); + verifier.setTimePeriod(PERIOD); codeVerifier = verifier; } @@ -83,9 +83,9 @@ public class OtpManager { .label(userEmail) .secret(secret) .issuer(Strings.isEmpty(issuer) ? getApplicationName() : issuer) - .algorithm(alg) - .digits(digits) - .period(period) + .algorithm(ALGORITHM) + .digits(DIGITS) + .period(PERIOD) .build(); QrGenerator generator = new ZxingPngQrGenerator(); try { diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html index fed76667a..a49fd5ece 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html @@ -21,7 +21,6 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd"> <wicket:extend> - <!-- TODO localized versions of this file need to be created --> <div class="message"> <strong>OpenMeetings - Loading ...</strong><br /> The server is not yet completely initialized. Please try again in a couple of seconds.<br/> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java index 682229d8b..947206fea 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java @@ -99,6 +99,7 @@ public class OtpDialog extends Modal<User> { private final RequiredTextField<String> otpField = new RequiredTextField<>("otp", Model.of("")) { private static final long serialVersionUID = 1L; + @Override protected String[] getInputTypes() { return new String[]{"number"}; }; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html index 2429bb715..5544798c0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html @@ -21,7 +21,6 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd"> <wicket:panel> - <!-- TODO design should be changed in the future --> <div class="profile-panel"> <table class="messages"> <tr> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ToggleOtpDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ToggleOtpDialog.html index ed67296a7..aa81162a6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ToggleOtpDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ToggleOtpDialog.html @@ -31,7 +31,7 @@ <div class="row"> <div class="col-6"> <div><wicket:message key="otp.qr.desc"/></div> - <img class="col-12" wicket:id="qr"/> + <img class="col-12" wicket:id="qr" wicket:message="alt:otp.qr.desc,title:otp.qr.desc"/> </div> <div class="col-6"> <div><wicket:message key="otp.fallback.desc"/></div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html index 0fac551ad..01b02d0b5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html @@ -21,7 +21,6 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd"> <wicket:panel> - <!-- TODO move styles into CSS --> <div class="d-flex profile-panel"> <div wicket:id="container" class="pe-3 h-100"> <div>