community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Duplicate keys for same permission in different files

Browse Source
This commit is contained in:
Viranga Gunarathna 2023-09-28 21:20:37 +05:30
parent 8180baefd9
commit 939b2c7e83
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java
View File

@ -67,7 +67,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Enroll Device", name = "Enroll Device",
description = "Register an Android device", description = "Register an Android device",
key = "and:conf:devices:enroll", key = "and:devices:enroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
), ),
@ -208,7 +208,7 @@ public interface DeviceTypeConfigurationService {
tags = "Android Configuration Management", tags = "Android Configuration Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:devices:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )

6
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java
View File

@ -67,7 +67,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Enroll Device", name = "Enroll Device",
description = "Register an Android device", description = "Register an Android device",
key = "and:event:devices:enroll", key = "and:devices:enroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
) )
@ -86,7 +86,7 @@ public interface EventReceiverService {
tags = "Event Receiver", tags = "Event Receiver",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -149,7 +149,7 @@ public interface EventReceiverService {
tags = "Event Receiver", tags = "Event Receiver",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )

3
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
View File

@ -13,8 +13,7 @@
"and:ops:lock-devices", "and:ops:lock-devices",
"and:ops:configure-vpn", "and:ops:configure-vpn",
"and:ops:configure-wifi", "and:ops:configure-wifi",
"and:conf:devices:enroll", "and:devices:enroll",
"and:event:devices:enroll",
"and:ops:uninstall-app", "and:ops:uninstall-app",
"and:conf:manage", "and:conf:manage",
"and:ops:location", "and:ops:location",