Refactor code

wso2-extensions · Oct 5, 2023 · 7d6d0fd · 7d6d0fd
1 parent 662aaf0
commit 7d6d0fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...main/java/org/wso2/carbon/identity/recovery/endpoint/impl/ValidateCodeApiServiceImpl.java b/...main/java/org/wso2/carbon/identity/recovery/endpoint/impl/ValidateCodeApiServiceImpl.java
@@ -30,18 +30,8 @@ public Response validateCodePost(CodeValidationRequestDTO codeValidationRequestD
         try {
             NotificationPasswordRecoveryManager notificationPasswordRecoveryManager = RecoveryUtil
                     .getNotificationBasedPwdRecoveryManager();
-            String code = codeValidationRequestDTO.getCode();
-            try {
-                String hashedCode = Utils.doHash(code);
-                user = notificationPasswordRecoveryManager
-                        .getValidatedUser(hashedCode, codeValidationRequestDTO.getStep());
-            } catch (UserStoreException e) {
-                throw Utils.handleServerException(
-                        IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_NO_HASHING_ALGO_FOR_CODE, null);
-            } catch (IdentityRecoveryException e) {
-                user = notificationPasswordRecoveryManager
-                        .getValidatedUser(code, codeValidationRequestDTO.getStep());
-            }
+            user = notificationPasswordRecoveryManager
+                    .getValidatedUser(codeValidationRequestDTO.getCode(), codeValidationRequestDTO.getStep());
         } catch (IdentityRecoveryClientException e) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Client Error while validating the confirmation code ", e);

diff --git a/.../java/org/wso2/carbon/identity/recovery/password/NotificationPasswordRecoveryManager.java b/.../java/org/wso2/carbon/identity/recovery/password/NotificationPasswordRecoveryManager.java
@@ -1074,7 +1074,16 @@ public void validateConfirmationCode(String code, String recoveryStep) throws Id
     public User getValidatedUser(String code, String recoveryStep) throws IdentityRecoveryException {
 
         UserRecoveryDataStore userRecoveryDataStore = JDBCRecoveryDataStore.getInstance();
-        UserRecoveryData userRecoveryData = userRecoveryDataStore.load(code);
+        UserRecoveryData userRecoveryData;
+        try {
+            String hashedCode = Utils.doHash(code);
+            userRecoveryData = userRecoveryDataStore.load(hashedCode);
+        } catch (UserStoreException e) {
+            throw Utils.handleServerException(
+                    IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_NO_HASHING_ALGO_FOR_CODE, null);
+        } catch (IdentityRecoveryException e) {
+            userRecoveryData = userRecoveryDataStore.load(code);
+        }
         String contextTenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         String userTenantDomain = userRecoveryData.getUser().getTenantDomain();
         if (!StringUtils.equals(contextTenantDomain, userTenantDomain)) {