ES-904 (mosip#797)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
Infosys · Jul 1, 2024 · 7c42eb8 · 7c42eb8
1 parent 76aecd0
commit 7c42eb8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 267 deletions.
diff --git a/esignet-core/src/main/java/io/mosip/esignet/core/util/CaptchaHelper.java b/esignet-core/src/main/java/io/mosip/esignet/core/util/CaptchaHelper.java
@@ -1,3 +1,8 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
 package io.mosip.esignet.core.util;
 
 import io.mosip.esignet.core.constants.ErrorConstants;
@@ -65,13 +70,12 @@ public boolean validateCaptcha(String captchaToken) {
                     return true;
                 }
                 log.error("Errors received from CaptchaService: {}", responseWrapper.getErrors()); //NOSONAR responseWrapper is already evaluated to be not null
-                throw new EsignetException(ErrorConstants.INVALID_CAPTCHA);
             }
             log.error("Errors received from CaptchaService: {}", responseEntity.getStatusCode());
-            throw new EsignetException(ErrorConstants.INVALID_CAPTCHA);
         } catch (Exception e) {
-            throw new EsignetException(ErrorConstants.INVALID_CAPTCHA);
+            log.error("Failed to validate captcha", e);
         }
+        throw new EsignetException(ErrorConstants.INVALID_CAPTCHA);
     }
 
 }
diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/CaptchaValidator.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/CaptchaValidator.java
@@ -5,7 +5,9 @@
  */
 package io.mosip.esignet.api.spi;
 
+@Deprecated
 public interface CaptchaValidator {
 
+
     boolean validateCaptcha(String captchaToken);
 }
diff --git a/esignet-service/src/main/resources/application-dev.properties b/esignet-service/src/main/resources/application-dev.properties
diff --git a/esignet-service/src/main/resources/application-local.properties b/esignet-service/src/main/resources/application-local.properties
@@ -54,7 +54,7 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
 #This property is used for captcha validation and allowed values are send-otp and pwd.
 # captcha validation is enabled for the auth-factors - otp, pwd, bio and pin.
 mosip.esignet.captcha.required=send-otp,pwd,bio,pin
-mosip.esignet.captcha.validator-url=${mosipbox.public.url}${server.servlet.path}/v1/captcha/validatecaptcha
+mosip.esignet.captcha.validator-url=https://api-internal.dev.mosip.net/v1/captcha/validatecaptcha
 mosip.esignet.captcha.module-name=esignet
 
 mosip.esignet.host=localhost

diff --git a/esignet-service/src/test/resources/application-test.properties b/esignet-service/src/test/resources/application-test.properties
@@ -43,7 +43,7 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
 #This property is used for captcha validation and allowed values are send-otp and pwd.
 #captcha validation is enabled for send-otp and pwd.
 mosip.esignet.captcha.required=pwd
-mosip.esignet.captcha.validator-url=${mosipbox.public.url}${server.servlet.path}/v1/captcha/validatecaptcha
+mosip.esignet.captcha.validator-url=https://api-internal.dev.mosip.net/v1/captcha/validatecaptcha
 mosip.esignet.captcha.module-name=esignet
 
 mosip.esignet.host=http://localhost:8088