Merge conflict resolved.

vivo-project · Dec 11, 2023 · 62fffeb · 62fffeb
2 parents 44705db + 4a30ce2
commit 62fffeb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -80,6 +80,21 @@
             <artifactId>guava</artifactId>
             <version>30.1-jre</version>
         </dependency>
+        <dependency>
+            <groupId>net.logicsquad</groupId>
+            <artifactId>nanocaptcha</artifactId>
+            <version>1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>fluent-hc</artifactId>

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/CaptchaServiceBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/CaptchaServiceBean.java
@@ -67,7 +67,6 @@ public static boolean validateReCaptcha(String recaptchaResponse, String secretK
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpGet verificationRequest = new HttpGet(verificationUrl);
             HttpResponse verificationResponse = httpClient.execute(verificationRequest);
-
             String responseBody = EntityUtils.toString(verificationResponse.getEntity());
             ObjectMapper objectMapper = new ObjectMapper();
             ReCaptchaResponse response = objectMapper.readValue(responseBody, ReCaptchaResponse.class);

diff --git a/...in/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/...in/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
@@ -62,8 +62,7 @@ else if (StringUtils.isBlank(appBean.getContactMail())) {
         }
 
         else {
-            String captchaImpl =
-                ConfigurationProperties.getInstance().getProperty("captcha.implementation");
+            String captchaImpl = ConfigurationProperties.getInstance().getProperty("captcha.implementation");
             if (captchaImpl == null) {
                 captchaImpl = "";
             }