From 77d82238e28f98f6b0bcf06f6416e1ef645dc0d1 Mon Sep 17 00:00:00 2001 From: navodzoysa Date: Fri, 20 Oct 2023 11:57:26 +0530 Subject: [PATCH 1/3] Add android remove account scope to ui config --- .../src/main/resources/conf/mdm-ui-config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml index f3d64058e3..28114158a9 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml @@ -318,6 +318,7 @@ dm:metadata:create dm:metadata:update and:ops:add-google-acc + and:ops:authenticate-acc and:ops:update-default-sim and:ops:add-google-acc and:ops:device-info From 9054329e34cbf6814706f35a92f0d9c90143db7f Mon Sep 17 00:00:00 2001 From: Rajitha Kumara Date: Fri, 20 Oct 2023 14:48:38 +0530 Subject: [PATCH 2/3] Fix not detecting resource path --- .../service/api/admin/DeviceTypeManagementAdminService.java | 2 +- 1 file changed, 1 insertion(+), 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/api/admin/DeviceTypeManagementAdminService.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/api/admin/DeviceTypeManagementAdminService.java index ed5add345b..55122c2bd0 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/api/admin/DeviceTypeManagementAdminService.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/api/admin/DeviceTypeManagementAdminService.java @@ -75,7 +75,7 @@ import javax.ws.rs.core.Response; description = "Add, Edit or View a Device Type", key = "dm:admin:device-type:modify", roles = {"Internal/devicemgt-admin"}, - permissions = {"/device-mgt/admin/device-type"} + permissions = {"/device-mgt/admin/device-type/modify"} ), @Scope( name = "Getting Details of a Device Type", From 9ab12d1b3fb7c5c62ca52bca30878344652b6faf Mon Sep 17 00:00:00 2001 From: prathabanKavin Date: Sun, 22 Oct 2023 12:02:13 +0530 Subject: [PATCH 3/3] Add tenant view perm to role permissions --- .../mgt/api/jaxrs/service/impl/RoleManagementServiceImpl.java | 3 ++- .../device/mgt/core/device/mgt/api/jaxrs/util/Constants.java | 1 + 2 files changed, 3 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/RoleManagementServiceImpl.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/RoleManagementServiceImpl.java index bca483f6c0..19009bf436 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/RoleManagementServiceImpl.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/RoleManagementServiceImpl.java @@ -340,7 +340,8 @@ public class RoleManagementServiceImpl implements RoleManagementService { for (UIPermissionNode node : permissionNode.getNodeList()) { if (Constants.Permission.LOGIN.equals(node.getResourcePath()) || Constants.Permission.DEVICE_MGT.equals(node.getResourcePath()) || - Constants.Permission.APP_MGT.equals(node.getResourcePath())) { + Constants.Permission.APP_MGT.equals(node.getResourcePath()) || + Constants.Permission.TENANT.equals(node.getResourcePath())) { deviceMgtPermissionsList.add(node); } } 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/util/Constants.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/util/Constants.java index 0a9b6efa26..75ba2cc322 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/util/Constants.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/util/Constants.java @@ -84,6 +84,7 @@ public class Constants { public static final String LOGIN = "/permission/admin/login"; public static final String DEVICE_MGT = "/permission/admin/device-mgt"; public static final String APP_MGT = "/permission/admin/app-mgt"; + public static final String TENANT = "/permission/admin/tenants"; } }