return optional from buildPasswordRecoveryInitResponse

wso2 · Nov 24, 2023 · eb9547e · eb9547e
1 parent 8e9e7e8
commit eb9547e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/...org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java b/...org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java
@@ -79,7 +79,6 @@ public Response initiatePasswordRecovery(InitRequest initRequest) {
 
             boolean isNotificationBasedRecoveryEnabled = isNotificationBasedRecoveryEnabled(tenantDomain);
             boolean isQuestionBasedRecoveryAllowedForUser = isQuestionBasedRecoveryEnabled(tenantDomain);
-            RecoveryInformationDTO recoveryInformationDTO = null;
             ArrayList<AccountRecoveryType> accountRecoveryTypes = new ArrayList<>();
             List<Object> passwordRecoveryManagerList = PrivilegedCarbonContext
                     .getThreadLocalCarbonContext().getOSGiServices(PasswordRecoveryManager.class, null);
@@ -94,10 +93,12 @@ public Response initiatePasswordRecovery(InitRequest initRequest) {
             }
 
             for (Object passwordRecoveryManager : passwordRecoveryManagerList) {
-                recoveryInformationDTO = ((PasswordRecoveryManager) passwordRecoveryManager).initiate(userClaims,
-                        tenantDomain, RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
-                Optional.ofNullable(buildPasswordRecoveryInitResponse(tenantDomain, recoveryInformationDTO))
-                        .ifPresent(accountRecoveryTypes::add);
+                RecoveryInformationDTO recoveryInformationDTO = ((PasswordRecoveryManager) passwordRecoveryManager)
+                        .initiate(userClaims, tenantDomain,
+                                RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
+                Optional<AccountRecoveryType> recoveryType =
+                        buildPasswordRecoveryInitResponse(tenantDomain, recoveryInformationDTO);
+                recoveryType.ifPresent(accountRecoveryTypes::add);
             }
 
             if (accountRecoveryTypes.isEmpty()) {
@@ -433,15 +434,14 @@ private RecoveryChannelInformation buildRecoveryChannelInformation(
     * @param recoveryInformationDTO RecoveryInformationDTO which wraps the password recovery information
     * @return AccountRecoveryType object with recovery options available for the user.
      */
-    private AccountRecoveryType buildPasswordRecoveryInitResponse(String tenantDomain,
-                                                                  RecoveryInformationDTO recoveryInformationDTO) {
-
-        AccountRecoveryType accountRecoveryType = null;
+    private Optional<AccountRecoveryType> buildPasswordRecoveryInitResponse(String tenantDomain,
+                                                               RecoveryInformationDTO recoveryInformationDTO) {
 
         if (recoveryInformationDTO == null) {
-            return accountRecoveryType;
+            return Optional.empty();
         }
 
+        AccountRecoveryType accountRecoveryType = null;
         boolean isNotificationBasedRecoveryEnabled = recoveryInformationDTO.isNotificationBasedRecoveryEnabled();
         boolean isQuestionBasedRecoveryAllowedForUser = recoveryInformationDTO.isQuestionBasedRecoveryAllowedForUser();
 
@@ -471,7 +471,7 @@ private AccountRecoveryType buildPasswordRecoveryInitResponse(String tenantDomai
             accountRecoveryType = buildAccountRecoveryType(
                     Constants.RECOVER_WITH_CHALLENGE_QUESTIONS, null, apiCallsArrayList);
         }
-        return accountRecoveryType;
+        return Optional.ofNullable(accountRecoveryType);
     }
 
     /*