Skip to content

Commit 495d02e

Browse files
vagishaclaude
andcommitted
Address Claude Code reviewer comments
- Catch ConfigurationException from sendEmail (was only catching MessagingException) - Add status="ERROR" to API captcha-failure response for consistency with other response paths - Remove hardcoded "six characters" from kaptcha instruction text - Add aria-label to kaptcha input field - Use method reference in errorsToMessages stream Co-Authored-By: Claude <noreply@anthropic.com>
1 parent c79cf0e commit 495d02e

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

signup/src/org/labkey/signup/SignUpController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.labkey.api.security.permissions.ReadPermission;
5656
import org.labkey.api.settings.LookAndFeelProperties;
5757
import org.labkey.api.util.ButtonBuilder;
58+
import org.labkey.api.util.ConfigurationException;
5859
import org.labkey.api.util.DOM;
5960
import org.labkey.api.util.PageFlowUtil;
6061
import org.labkey.api.util.URLHelper;
@@ -68,6 +69,7 @@
6869
import org.labkey.api.view.WebPartView;
6970
import org.springframework.validation.BindException;
7071
import org.springframework.validation.Errors;
72+
import org.springframework.validation.ObjectError;
7173
import org.springframework.web.servlet.ModelAndView;
7274

7375
import java.util.ArrayList;
@@ -699,7 +701,7 @@ private boolean createUserAndSendEmail(SignupForm form, ValidEmail email, Errors
699701
SecurityManager.getRegistrationMessage(null, false),
700702
email.getEmailAddress(), confirmationUrl);
701703
}
702-
catch (MessagingException e)
704+
catch (MessagingException | ConfigurationException e)
703705
{
704706
String systemEmail = LookAndFeelProperties.getInstance(getContainer()).getSystemEmailAddress();
705707
errors.reject(ERROR_MSG, "Could not send new user registration email. Please contact your server administrator at " + systemEmail);
@@ -717,7 +719,7 @@ private boolean createUserAndSendEmail(SignupForm form, ValidEmail email, Errors
717719
private static List<String> errorsToMessages(Errors errors)
718720
{
719721
return errors.getAllErrors().stream()
720-
.map(e -> e.getDefaultMessage())
722+
.map(ObjectError::getDefaultMessage)
721723
.toList();
722724
}
723725

@@ -882,6 +884,7 @@ public ApiResponse execute(SignupForm signupForm, BindException errors) throws E
882884
String kaptchaError = verifyCaptcha(signupForm.getKaptchaText(), signupForm.getEmail());
883885
if (kaptchaError != null)
884886
{
887+
response.put("status", "ERROR");
885888
response.put("error_message", List.of(kaptchaError));
886889
return response;
887890
}

signup/src/org/labkey/signup/signupPage.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
<%-- Verification: standalone full-width block --%>
2020
<div style="margin-top:20px;"><strong>Verification</strong></div>
21-
<p style="margin:8px 0 4px 0;">Please enter the six characters shown below (case-insensitive).</p>
21+
<p style="margin:8px 0 4px 0;">Please enter the characters shown below (case-insensitive).</p>
2222
<p style="margin:0 0 8px 0;"><a id="kaptchaReload" href="#">Get a new image.</a></p>
2323
<img id="kaptchaImg" src="<%=h(contextPath)%>/kaptcha.jpg" alt="Captcha" width="200" height="50" style="border: 1px solid #ccc; display:block; margin-bottom:6px;"/>
24-
<input type="text" id="kaptchaText" name="kaptchaText" style="width:200px;"/>
24+
<input type="text" id="kaptchaText" name="kaptchaText" aria-label="Verification code" style="width:200px;"/>
2525

2626
<div style="margin-top:20px; clear:both;">
2727
<button type="submit" class="btn btn-default labkey-button">Register</button>

0 commit comments

Comments
 (0)