Gitlab-Migration/rheinsw-mono-repo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hCaptcha integration from contact form and API route

Browse Source
This commit is contained in:
Thatsaphorn
2025-06-29 20:39:57 +09:00
parent 498f1a59b5
commit a9d8a8cf43
2 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCaseImpl.java
View File

@@ -26,7 +26,7 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
private static final Logger log = LoggerFactory.getLogger(SubmitContactUseCaseImpl.class);
private final HCaptchaValidator captchaValidator;
//private final HCaptchaValidator captchaValidator;
private final ContactRequestsRepo contactRepository;
private final SendMailUseCase sendMailUseCase; // Inject SendMailUseCase
@@ -37,7 +37,7 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
public SubmitContactUseCaseImpl(HCaptchaValidator captchaValidator,
ContactRequestsRepo contactRepository,
SendMailUseCase sendMailUseCase) {
this.captchaValidator = captchaValidator;
//this.captchaValidator = captchaValidator;
this.contactRepository = contactRepository;
this.sendMailUseCase = sendMailUseCase;
}
@@ -45,17 +45,17 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
@Override
public ResponseEntity<String> submitContact(ContactRequestDto request) {
log.info("Received contact form from: {}", request.name());
log.debug("Captcha token: {}", request.captcha());
//log.debug("Captcha token: {}", request.captcha());
log.info("Message: {}", request.message());
if (request.email() != null) {
log.info("Reply to: {} ({})", request.email(), request.name());
}
if (!isValidCaptcha(request.captcha())) {
log.warn("Captcha verification failed for {}", request.email());
return ResponseEntity.status(HttpStatus.FORBIDDEN).body("Captcha verification failed");
}
//if (!isValidCaptcha(request.captcha())) {
// log.warn("Captcha verification failed for {}", request.email());
// return ResponseEntity.status(HttpStatus.FORBIDDEN).body("Captcha verification failed");
//}
ContactRequest message = new ContactRequest()
.setName(request.name())
@@ -80,9 +80,9 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
return ResponseEntity.ok("Contact form submitted successfully");
}
private boolean isValidCaptcha(String captcha) {
return "10000000-aaaa-bbbb-cccc-000000000001".equals(captcha) || captchaValidator.isValid(captcha);
}
//private boolean isValidCaptcha(String captcha) {
// return "10000000-aaaa-bbbb-cccc-000000000001".equals(captcha) || captchaValidator.isValid(captcha);
//}
private void notifyContactAndTeam(ContactRequestDto request) {
// User confirmation
@@ -96,7 +96,7 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
%s
Mit freundlichen Grüßen
Rhein Software
Rhein Software Development
""".formatted(request.name(), request.message());
// Send confirmation email to user
@@ -137,4 +137,4 @@ public class SubmitContactUseCaseImpl implements SubmitContactUseCase {
private String safe(String value) {
return value != null ? value : "-";
}
}
}