Merge pull request #181 from Rashmini/recovery-v2

Handle error scenarios related to recovery flow id
wso2 · Oct 2, 2023 · 0904907 · 0904907
2 parents a8d3ec8 + 8c02dad
commit 0904907
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/utils/RecoveryUtil.java b/...java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/utils/RecoveryUtil.java
@@ -244,7 +244,11 @@ public static WebApplicationException handleIdentityRecoveryException(IdentityRe
         } else if (IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_INVALID_RECOVERY_CODE.getCode().equals(
                 e.getErrorCode()) || IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_INVALID_RESEND_CODE.getCode().
                 equals(e.getErrorCode()) || IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_EXPIRED_RECOVERY_CODE.
-                getCode().equals(e.getErrorCode())) {
+                getCode().equals(e.getErrorCode()) || IdentityRecoveryConstants.ErrorMessages.
+                ERROR_CODE_INVALID_RECOVERY_FLOW_ID.getCode().equals(e.getErrorCode()) || IdentityRecoveryConstants.
+                ErrorMessages.ERROR_CODE_EXPIRED_RECOVERY_FLOW_ID.getCode().equals(e.getErrorCode()) ||
+                IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_NO_RECOVERY_FLOW_DATA.getCode().equals(
+                        e.getErrorCode())) {
             errorMessage = Constants.STATUS_METHOD_NOT_ACCEPTED_MESSAGE_DEFAULT;
             status = Response.Status.NOT_ACCEPTABLE;
         } else if (IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_PASSWORD_HISTORY_VIOLATION.getCode().equals(