community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

Browse Source
This commit is contained in:
pasindu 2023-10-23 18:09:19 +05:30
commit c7494bcd81
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
View File

@ -58,7 +58,7 @@ import javax.ws.rs.core.Response;
description = "Add, Edit or View a Device Type", description = "Add, Edit or View a Device Type",
key = "dm:admin:device-type:modify", key = "dm:admin:device-type:modify",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/admin/device-type"} permissions = {"/device-mgt/admin/device-type/modify"}
), ),
@Scope( @Scope(
name = "Getting Details of a Device Type", name = "Getting Details of a Device Type",

3
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
View File

@ -361,7 +361,8 @@ public class RoleManagementServiceImpl implements RoleManagementService {
for (UIPermissionNode node : permissionNode.getNodeList()) { for (UIPermissionNode node : permissionNode.getNodeList()) {
if (Constants.Permission.LOGIN.equals(node.getResourcePath()) || if (Constants.Permission.LOGIN.equals(node.getResourcePath()) ||
Constants.Permission.DEVICE_MGT.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); deviceMgtPermissionsList.add(node);
} }
} }

1
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
View File

@ -84,6 +84,7 @@ public class Constants {
public static final String LOGIN = "/permission/admin/login"; public static final String LOGIN = "/permission/admin/login";
public static final String DEVICE_MGT = "/permission/admin/device-mgt"; public static final String DEVICE_MGT = "/permission/admin/device-mgt";
public static final String APP_MGT = "/permission/admin/app-mgt"; public static final String APP_MGT = "/permission/admin/app-mgt";
public static final String TENANT = "/permission/admin/tenants";
} }
} }

1
features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
View File

@ -318,6 +318,7 @@
<Scope>dm:metadata:create</Scope> <Scope>dm:metadata:create</Scope>
<Scope>dm:metadata:update</Scope> <Scope>dm:metadata:update</Scope>
<Scope>and:ops:add-google-acc</Scope> <Scope>and:ops:add-google-acc</Scope>
<Scope>and:ops:authenticate-acc</Scope>
<Scope>and:ops:update-default-sim</Scope> <Scope>and:ops:update-default-sim</Scope>
<Scope>and:ops:add-google-acc</Scope> <Scope>and:ops:add-google-acc</Scope>
<Scope>and:ops:device-info</Scope> <Scope>and:ops:device-info</Scope>