Merge pull request #231 from kumardeepak5/21659-fix

Fix for issue product-is/21659
wso2 · Jan 24, 2025 · 8580d0d · 8580d0d
2 parents aac2c71 + ee3c968
commit 8580d0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/Constants.java b/...src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/Constants.java
@@ -38,6 +38,7 @@ public class Constants {
     public static final String STATUS_PRECONDITION_FAILED_MESSAGE_DEFAULT = "Precondition Failed";
     public static final String STATUS_INTERNAL_SERVER_ERROR_DESCRIPTION_DEFAULT =
             "The server encountered an internal error. Please contact administrator.";
+    public static final String STATUS_BAD_REQUEST_DEFAULT = "Bad Request";
 
     // Recovery type.
     public static final String RECOVERY_WITH_NOTIFICATIONS = "recoverWithNotifications";

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
@@ -256,6 +256,10 @@ public static WebApplicationException handleIdentityRecoveryException(IdentityRe
                 getCode().equals(e.getErrorCode())) {
             return RecoveryUtil.buildRetryPasswordResetObject(tenantDomain, errorDescription, errorCode, code,
                     correlationId);
+        } else if (IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_INVALID_CHANNEL_ID.getCode().equals(
+                e.getErrorCode())) {
+            errorMessage = Constants.STATUS_BAD_REQUEST_DEFAULT;
+            status = Response.Status.BAD_REQUEST;
         }
 
         if (e instanceof IdentityRecoveryClientException) {