From 1e2f9708da3cb5f71541fd1b8327793dcdb31518 Mon Sep 17 00:00:00 2001
From: ruchira123 <ruchiralakshan2003@gmail.com>
Date: Tue, 14 Jul 2026 18:15:40 +0530
Subject: [PATCH] Handle null request body in Organization management POST
 endpoints to avoid 500 error

---
 .../v1/service/OrganizationManagementService.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
index 3c91cd71c3..5b392ca9f8 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
@@ -273,6 +273,10 @@ public Response updateOrganization(String organizationId, OrganizationPUTRequest
     public Response addOrganization(OrganizationPOSTRequest organizationPOSTRequest) {
 
         try {
+            if (organizationPOSTRequest == null) {
+                throw new OrganizationManagementClientException("Empty request body.", 
+                        "The request body cannot be empty or null.", "ORG-60025");
+            }
             Organization organization = organizationManager.addOrganization(getOrganizationFromPostRequest
                     (organizationPOSTRequest));
             String organizationId = organization.getId();
@@ -415,6 +419,10 @@ public Response addOrganizationDiscoveryAttributes(OrganizationDiscoveryPostRequ
                                                                organizationDiscoveryPostRequest) {
 
         try {
+            if (organizationDiscoveryPostRequest == null) {
+                throw new OrganizationManagementClientException("Empty request body.", 
+                        "The request body cannot be empty or null.", "ORG-60025");
+            }
             List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .addOrganizationDiscoveryAttributes(organizationDiscoveryPostRequest.getOrganizationId(),
                             getOrgDiscoveryAttributesFromPostRequest(organizationDiscoveryPostRequest), true);
@@ -549,6 +557,10 @@ public Response isDiscoveryAttributeAvailable(OrganizationDiscoveryCheckPOSTRequ
                                                           organizationDiscoveryCheckPOSTRequest) {
 
         try {
+            if (organizationDiscoveryCheckPOSTRequest == null) {
+                throw new OrganizationManagementClientException("Empty request body.", 
+                        "The request body cannot be empty or null.", "ORG-60025");
+            }
             boolean discoveryAttributeValueAvailable = organizationDiscoveryManager
                     .isDiscoveryAttributeValueAvailable(organizationDiscoveryCheckPOSTRequest.getType(),
                             organizationDiscoveryCheckPOSTRequest.getValue());