Refactor code

wso2-extensions · May 29, 2023 · 27a285a · 27a285a
1 parent aaa8aec
commit 27a285a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/...recovery/src/main/java/org/wso2/carbon/identity/recovery/endpoint/Utils/RecoveryUtil.java b/...recovery/src/main/java/org/wso2/carbon/identity/recovery/endpoint/Utils/RecoveryUtil.java
@@ -457,7 +457,7 @@ private static Properties validateCaptchaConfigs(Properties properties) {
         boolean reCaptchaEnterpriseEnabled = Boolean.valueOf(properties.getProperty(CaptchaConstants
                 .RE_CAPTCHA_ENTERPRISE_ENABLED));
 
-        if (reCaptchaEnabled || reCaptchaEnterpriseEnabled) {
+        if (reCaptchaEnabled) {
             if (StringUtils.isBlank(properties.getProperty(CaptchaConstants.RE_CAPTCHA_SITE_KEY))) {
                 RecoveryUtil.handleBadRequest(String.format("%s is not found ", CaptchaConstants.RE_CAPTCHA_SITE_KEY),
                         Constants.STATUS_INTERNAL_SERVER_ERROR_MESSAGE_DEFAULT);
@@ -495,6 +495,7 @@ public static HttpResponse makeCaptchaVerificationHttpRequest(ReCaptchaResponseT
 
         HttpResponse response = null;
         String reCaptchaVerifyUrl = properties.getProperty(CaptchaConstants.RE_CAPTCHA_VERIFY_URL);
+        String reCaptchaSecretKey = properties.getProperty(CaptchaConstants.RE_CAPTCHA_SECRET_KEY);
         boolean reCaptchaEnterpriseEnabled =
                 Boolean.valueOf(properties.getProperty(CaptchaConstants.RE_CAPTCHA_ENTERPRISE_ENABLED));
         CloseableHttpClient httpclient = HttpClientBuilder.create().useSystemProperties().build();
@@ -503,9 +504,9 @@ public static HttpResponse makeCaptchaVerificationHttpRequest(ReCaptchaResponseT
         if (reCaptchaEnterpriseEnabled) {
             // For ReCaptcha Enterprise.
             String projectID = properties.getProperty(CaptchaConstants.RE_CAPTCHA_PROJECT_ID);
-            String secretKey = properties.getProperty(CaptchaConstants.RE_CAPTCHA_SECRET_KEY);
             String siteKey = properties.getProperty(CaptchaConstants.RE_CAPTCHA_SITE_KEY);
-            String verifyUrl = reCaptchaVerifyUrl + "/v1/projects/" + projectID + "/assessments?key=" + secretKey;
+            String verifyUrl = reCaptchaVerifyUrl + "/v1/projects/" + projectID +
+                    "/assessments?key=" + reCaptchaSecretKey;
             httpPost = new HttpPost(verifyUrl);
             httpPost.setHeader(Constants.HEADER_CONTENT_TYPE, Constants.APPLICATION_JSON);
             String json = String.format("{ \"event\": { \"token\": \"%s\", \"siteKey\": \"%s\" } }", reCaptchaResponse,
@@ -521,8 +522,6 @@ public static HttpResponse makeCaptchaVerificationHttpRequest(ReCaptchaResponseT
             }
         } else {
             // For ReCaptcha v2 and v3.
-            String reCaptchaSecretKey = properties.getProperty(CaptchaConstants.RE_CAPTCHA_SECRET_KEY);
-
             httpPost = new HttpPost(reCaptchaVerifyUrl);
             List<BasicNameValuePair> params = Arrays.asList(new BasicNameValuePair("secret", reCaptchaSecretKey),
                     new BasicNameValuePair("response", reCaptchaResponse.getToken()));

diff --git a/.../src/main/java/org/wso2/carbon/identity/recovery/endpoint/impl/CaptchaApiServiceImpl.java b/.../src/main/java/org/wso2/carbon/identity/recovery/endpoint/impl/CaptchaApiServiceImpl.java
@@ -62,7 +62,7 @@ public Response getCaptcha(String captchaType, String recoveryType, String tenan
                 Boolean.valueOf(properties.getProperty(CaptchaConstants.FORCEFULLY_ENABLED_RECAPTCHA_FOR_ALL_TENANTS));
         ReCaptchaPropertiesDTO reCaptchaPropertiesDTO = new ReCaptchaPropertiesDTO();
 
-        if ((reCaptchaEnabled || reCaptchaEnterpriseEnabled) && (forcefullyEnabledRecaptchaForAllTenants ||
+        if (reCaptchaEnabled && (forcefullyEnabledRecaptchaForAllTenants ||
                 RecoveryUtil.checkCaptchaEnabledResidentIdpConfiguration(tenantDomain, recoveryType))) {
             reCaptchaPropertiesDTO.setReCaptchaEnabled(reCaptchaEnabled);
             reCaptchaPropertiesDTO.setReCaptchaKey(properties.getProperty(CaptchaConstants.RE_CAPTCHA_SITE_KEY));
@@ -88,7 +88,7 @@ public Response verifyCaptcha(ReCaptchaResponseTokenDTO reCaptchaResponse, Strin
         boolean reCaptchaEnterpriseEnabled =
                 Boolean.valueOf(properties.getProperty(CaptchaConstants.RE_CAPTCHA_ENTERPRISE_ENABLED));
 
-        if (!reCaptchaEnabled && !reCaptchaEnterpriseEnabled) {
+        if (!reCaptchaEnabled) {
             RecoveryUtil.handleBadRequest("ReCaptcha is disabled", Constants.INVALID);
         }
 

diff --git a/...bon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/util/CaptchaUtil.java b/...bon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/util/CaptchaUtil.java
@@ -115,21 +115,18 @@ public static void buildReCaptchaFilterProperties() throws CaptchaServerExceptio
                 CaptchaDataHolder.getInstance().setReCaptchaErrorRedirectUrls(reCaptchaFailedRedirectUrls);
             }
 
-            if (reCaptchaEnabled && reCaptchaEnterpriseEnabled) {
-                throw new CaptchaServerException("Both reCaptcha and reCaptchaEnterprise " +
-                        "cannot be enabled at the same time.");
+            if (!reCaptchaEnabled && reCaptchaEnterpriseEnabled) {
+                throw new CaptchaServerException("reCaptcha is not enabled. Please enable reCaptcha to use " +
+                        "reCaptcha Enterprise.");
             }
 
             if (reCaptchaEnabled) {
                 CaptchaDataHolder.getInstance().setReCaptchaEnabled(true);
-                CaptchaDataHolder.getInstance().setReCaptchaEnterpriseEnabled(false);
-                resolveSecrets(properties);
-                setReCaptchaConfigs(properties);
-                //setSSOLoginConnectorConfigs(properties);
-                //setPathBasedConnectorConfigs(properties);
-            } else if (reCaptchaEnterpriseEnabled) {
-                CaptchaDataHolder.getInstance().setReCaptchaEnabled(false);
-                CaptchaDataHolder.getInstance().setReCaptchaEnterpriseEnabled(true);
+                if (reCaptchaEnterpriseEnabled) {
+                    CaptchaDataHolder.getInstance().setReCaptchaEnterpriseEnabled(true);
+                } else {
+                    CaptchaDataHolder.getInstance().setReCaptchaEnterpriseEnabled(false);
+                }
                 resolveSecrets(properties);
                 setReCaptchaConfigs(properties);
                 //setSSOLoginConnectorConfigs(properties);
@@ -535,10 +532,7 @@ private static UserStoreManager getUserStoreManagerForUser(String userName,
 
     private static void setReCaptchaConfigs(Properties properties) {
 
-        boolean recaptchaEnterpriseEnabled =
-                Boolean.parseBoolean(properties.getProperty(CaptchaConstants.RE_CAPTCHA_ENTERPRISE_ENABLED));
-
-        CaptchaDataHolder.getInstance().setReCaptchaEnterpriseEnabled(recaptchaEnterpriseEnabled);
+        boolean recaptchaEnterpriseEnabled = CaptchaDataHolder.getInstance().isReCaptchaEnterpriseEnabled();
 
         if (recaptchaEnterpriseEnabled){
             // ReCaptcha Enterprise require Project ID.