Call deleteGroupWithID from deleteGroup function

wso2-extensions · Aug 9, 2023 · 1f68054 · 1f68054
1 parent e96d5fd
commit 1f68054
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -2780,8 +2780,10 @@ public void deleteGroup(String groupId) throws NotFoundException, CharonExceptio
  SCIMCommonUtils.setThreadLocalIsManagedThroughSCIMEP(true);
 
  // Get group name by id.
- SCIMGroupHandler groupHandler = new SCIMGroupHandler(carbonUM.getTenantId());
- String groupName = groupHandler.getGroupName(groupId);
+// SCIMGroupHandler groupHandler = new SCIMGroupHandler(carbonUM.getTenantId());
+// String groupName = groupHandler.getGroupName(groupId);
+
+ String groupName = carbonUM.getGroupNameByGroupId(groupId);
 
  if (groupName != null) {
  String userStoreDomainFromSP = null;
@@ -2805,7 +2807,8 @@ public void deleteGroup(String groupId) throws NotFoundException, CharonExceptio
  }
 
  //delete group in carbon UM
- carbonUM.deleteRole(groupName);
+// carbonUM.deleteRole(groupName);
+ carbonUM.deleteGroupWithID(groupId);
  carbonUM.removeGroupRoleMappingByGroupName(groupName);
 
  //we do not update Identity_SCIM DB here since it is updated in SCIMUserOperationListener's methods.
@@ -2821,9 +2824,10 @@ public void deleteGroup(String groupId) throws NotFoundException, CharonExceptio
  }
  } catch (UserStoreException e) {
  throw resolveError(e, "Error occurred while deleting group " + groupId);
- } catch (IdentitySCIMException e) {
- throw new CharonException("Error occurred while deleting group " + groupId, e);
  }
+// catch (IdentitySCIMException e) {
+// throw new CharonException("Error occurred while deleting group " + groupId, e);
+// }
 
  }