Merge pull request #539 from ShanChathusanda93/sub-org-user-delete-fi…

…x-branch Fix user deletion issue in the sub organizations
wso2-extensions · Mar 19, 2024 · 08af9f0 · 08af9f0
2 parents 188e191 + 2ea92b7
commit 08af9f0
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();