diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtService.java b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtService.java index 578fdabc5e..09655672c1 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtService.java +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtService.java @@ -73,7 +73,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Device Organization", description = "Device Organization", - key = "device-organization", + key = "dm:device-organization", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ) @@ -100,7 +100,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -143,7 +143,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -191,7 +191,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -232,7 +232,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -269,7 +269,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -306,7 +306,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -346,7 +346,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -384,7 +384,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -420,7 +420,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -458,7 +458,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -500,7 +500,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) @@ -539,7 +539,7 @@ public interface DeviceOrganizationMgtService { tags = "Device Organization Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "device-organization") + @ExtensionProperty(name = SCOPE, value = "dm:device-organization") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index 0d6874aa66..1cb9551532 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -164,7 +164,8 @@ "dm:admin:devices:permanent-delete", "appm:read", "and:enterprise:modify", - "and:enterprise:view" + "and:enterprise:view", + "dm:device-organization" ], "isOAuthEnabled": true, "backendRestEndpoints": { 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 aada3c5255..7b8ea1214d 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 @@ -352,6 +352,7 @@ am:store:vpp:assets:modify am:store:vpp:assets:view and:devices:enroll + dm:device-organization device-mgt