From 05811512482f6fb01884744d2b9922c598a8b663 Mon Sep 17 00:00:00 2001
From: ThilinaPremachandra <thilina@entgra.io>
Date: Sun, 2 Jul 2023 01:23:13 +0530
Subject: [PATCH] add: super-tenant admin check

---
 .../service/impl/admin/GroupManagementAdminServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
index 5e4d0d47891..636ed66062c 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
@@ -113,9 +113,10 @@ public class GroupManagementAdminServiceImpl implements GroupManagementAdminServ
             request.setOwner(owner);
             request.setStatus(status);
             request.setDepth(depth);
+            boolean isAdmin = DEFAULT_ADMIN_ROLE.equals(currentUser);
 
             PaginationResult deviceGroupsResult;
-            if (StringUtils.isBlank(currentUser)) {
+            if (StringUtils.isBlank(currentUser) || isAdmin) {
                 deviceGroupsResult = DeviceMgtAPIUtils.getGroupManagementProviderService()
                         .getGroupsWithHierarchy(null, request, requireGroupProps);
             } else {