Fix user deletion issue in the sub organizations

wso2-extensions · Mar 18, 2024 · 2ea92b7 · 2ea92b7
1 parent 188e191
commit 2ea92b7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...im2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java b/...im2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java
@@ -925,6 +925,9 @@ public static void updateSystemRoleV2MetaData(int tenantId) {
  */
  public static String getLoggedInUserID() throws CharonException {
 
+ if (PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserId() != null) {
+ return PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserId();
+ }
  try {
  String loggedInUserName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
  String loggedInUserTenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();