Merge pull request #477 from DilshanSenarath/dilshan

fix scim2 groups issue
wso2-extensions · Aug 3, 2023 · c70b214 · c70b214
2 parents 5eaf11c + b742b0f
commit c70b214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 11, 17 ]
+        java-version: [ 11.0.19+7 ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Adopt JDK 11 and 17

diff --git a/...entity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java b/...entity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java
@@ -390,7 +390,8 @@ public String getGroupNameById(int tenantId, String id) throws IdentitySCIMExcep
         } finally {
             IdentityDatabaseUtil.closeAllConnections(connection, rSet, prepStmt);
         }
-        if (StringUtils.isNotEmpty(roleName)) {
+        // Verify whether the roleName is not empty, and it's not contain any prefix Application/Internal
+        if (StringUtils.isNotEmpty(roleName) && !SCIMCommonUtils.isHybridRole(roleName)) {
             return SCIMCommonUtils.getPrimaryFreeGroupName(roleName);
         }
         return null;