From 48a72e80e9020c5c35b97fce2ed170e6b0e5c037 Mon Sep 17 00:00:00 2001 From: Viranga Gunarathna Date: Wed, 27 Sep 2023 23:48:16 +0530 Subject: [PATCH] Modify scope keys --- .../proxy/api/GrafanaAPIProxyService.java | 12 +- .../lifecycle/util/AnnotationProcessor.java | 2 +- .../webapp/publisher/utils/TestUtils.java | 2 +- .../mgt/api/CertificateMgtService.java | 4 +- .../CertificateManagementAdminService.java | 20 +- .../api/ActivityInfoProviderService.java | 12 +- .../AnalyticsArtifactsManagementService.java | 38 +- .../api/ConfigurationManagementService.java | 8 +- .../jaxrs/service/api/DeviceAgentService.java | 30 +- .../api/DeviceEventManagementService.java | 16 +- .../service/api/DeviceManagementService.java | 98 ++--- .../api/DeviceTypeManagementService.java | 16 +- .../service/api/GeoLocationBasedService.java | 42 +- .../service/api/GroupManagementService.java | 75 ++-- .../jaxrs/service/api/MetadataService.java | 18 +- .../api/NotificationManagementService.java | 10 +- .../service/api/PolicyManagementService.java | 46 +-- .../service/api/RemoteSessionService.java | 4 +- .../service/api/ReportManagementService.java | 18 +- .../service/api/RoleManagementService.java | 36 +- .../service/api/UserManagementService.java | 64 +-- .../jaxrs/service/api/WhiteLabelService.java | 10 +- .../ApplicationManagementAdminService.java | 8 +- ...DeviceAccessAuthorizationAdminService.java | 6 +- ...AnalyticsArtifactUploaderAdminService.java | 4 +- .../admin/DeviceManagementAdminService.java | 20 +- .../DeviceTypeManagementAdminService.java | 26 +- .../admin/GroupManagementAdminService.java | 18 +- .../api/admin/UserManagementAdminService.java | 10 +- .../DeviceManagementConfigService.java | 14 +- .../mgt/core/DeviceManagementConstants.java | 2 +- .../devicemgt/app/conf/config.json | 195 ++++----- .../modules/business-controllers/device.js | 4 +- .../private/config.json | 16 +- .../type-view.hbs | 2 +- .../api/ConfigurationManagementService.java | 4 +- .../src/main/resources/conf/mdm-ui-config.xml | 389 +++++++++--------- 37 files changed, 649 insertions(+), 650 deletions(-) diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java index c7081b8b97..d87eef1034 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java @@ -58,7 +58,7 @@ import javax.ws.rs.core.UriInfo; @Scope( name = "Using Grafana APIs required for Grafana iframes", description = "Grafana API proxy to validate requests.", - key = "perm:grafana:api:view", + key = "grafana:api:view", roles = {"Internal/grafanamgt-user"}, permissions = {"/analytics-mgt/grafana-mgt/api/view"} ) @@ -84,7 +84,7 @@ public interface GrafanaAPIProxyService { tags = "Analytics", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:grafana:api:view") + @ExtensionProperty(name = SCOPE, value = "grafana:api:view") }) } ) @@ -101,7 +101,7 @@ public interface GrafanaAPIProxyService { tags = "Analytics", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:grafana:api:view") + @ExtensionProperty(name = SCOPE, value = "grafana:api:view") }) } ) @@ -117,7 +117,7 @@ public interface GrafanaAPIProxyService { tags = "Analytics", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:grafana:api:view") + @ExtensionProperty(name = SCOPE, value = "grafana:api:view") }) } ) @@ -134,7 +134,7 @@ public interface GrafanaAPIProxyService { tags = "Analytics", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:grafana:api:view") + @ExtensionProperty(name = SCOPE, value = "grafana:api:view") }) } ) @@ -150,7 +150,7 @@ public interface GrafanaAPIProxyService { tags = "Analytics", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:grafana:api:view") + @ExtensionProperty(name = SCOPE, value = "grafana:api:view") }) } ) diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java index d51fe20f63..704de6442c 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java @@ -86,7 +86,7 @@ public class AnnotationProcessor { private static final String ANNOTATIONS_SCOPES = "scopes"; private static final String ANNOTATIONS_SCOPE = "scope"; private static final String DEFAULT_SCOPE_NAME = "default admin scope"; - private static final String DEFAULT_SCOPE_KEY = "perm:admin"; + private static final String DEFAULT_SCOPE_KEY = "dm:admin"; private static final String DEFAULT_SCOPE_PERMISSION = "/permision/device-mgt"; private static final String DEFAULT_SCOPE_ROLE = "admin"; diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/utils/TestUtils.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/utils/TestUtils.java index 0161c5cef5..988bd9c5f7 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/utils/TestUtils.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/utils/TestUtils.java @@ -37,7 +37,7 @@ public class TestUtils { template.setResourceURI("https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices/reboot"); template.setUriTemplate(uriTemplate); ApiScope scope = new ApiScope(); - scope.setKey("perm:windows:reboot"); + scope.setKey("win:ops:reboot"); scope.setName("Reboot"); scope.setRoles("/permission/admin/device-mgt/devices/owning-device/operations/windows/reboot"); scope.setDescription("Lock reset on Windows devices"); diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java index db14d6f072..f2bdb8fafd 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java @@ -58,7 +58,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Sign CSR", description = "Sign CSR", - key = "perm:sign-csr", + key = "dm:sign-csr", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/certificates/manage"} ) @@ -87,7 +87,7 @@ public interface CertificateMgtService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:sign-csr") + @ExtensionProperty(name = SCOPE, value = "dm:sign-csr") }) } ) diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java index af77d74719..34ddbd193a 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java @@ -62,35 +62,35 @@ import javax.ws.rs.core.Response; @Scope( name = "Adding a new SSL certificate", description = "Adding a new SSL certificate", - key = "perm:admin:certificates:add", + key = "cm:cert:add", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/certificates/add"} ), @Scope( name = "Getting Details of an SSL Certificate", description = "Getting Details of an SSL Certificate", - key = "perm:admin:certificates:details", + key = "cm:cert:details:get", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/certificates/details"} ), @Scope( name = "Getting Details of Certificates", description = "Getting Details of Certificates", - key = "perm:admin:certificates:view", + key = "cm:cert:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/certificates/view"} ), @Scope( name = "Deleting an SSL Certificate", description = "Deleting an SSL Certificate", - key = "perm:admin:certificates:delete", + key = "cm:cert:delete", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/certificates/delete"} ), @Scope( name = "Verify SSL certificate", description = "Verify SSL certificate", - key = "perm:admin:certificates:verify", + key = "cm:cert:verify", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/certificates/verify"} ) @@ -119,7 +119,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:add") + @ExtensionProperty(name = SCOPE, value = "cm:cert:add") }) } ) @@ -188,7 +188,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:details") + @ExtensionProperty(name = SCOPE, value = "cm:cert:details:get") }) } ) @@ -260,7 +260,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:view") + @ExtensionProperty(name = SCOPE, value = "cm:cert:view") }) } ) @@ -353,7 +353,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:delete") + @ExtensionProperty(name = SCOPE, value = "cm:cert:delete") }) } ) @@ -399,7 +399,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:verify") + @ExtensionProperty(name = SCOPE, value = "cm:cert:verify") }) } ) 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/ActivityInfoProviderService.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/ActivityInfoProviderService.java index 240f6bfb01..a1846536a1 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/ActivityInfoProviderService.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/ActivityInfoProviderService.java @@ -76,7 +76,7 @@ import java.util.List; @Scope( name = "Get activities", description = "Get activities", - key = "perm:get-activity", + key = "dm:activity:get", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ) @@ -97,7 +97,7 @@ public interface ActivityInfoProviderService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get") }) } ) @@ -171,7 +171,7 @@ public interface ActivityInfoProviderService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get") }) }, nickname = "getActivitiesByActivityIdList" @@ -234,7 +234,7 @@ public interface ActivityInfoProviderService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get") }) } ) @@ -331,7 +331,7 @@ public interface ActivityInfoProviderService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get") }) }, nickname = "getActivitiesByOperationCode" @@ -395,7 +395,7 @@ public interface ActivityInfoProviderService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get") }) }, nickname = "getActivitiesWithFilters" 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/AnalyticsArtifactsManagementService.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/AnalyticsArtifactsManagementService.java index a6b519d03b..0b627554bb 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/AnalyticsArtifactsManagementService.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/AnalyticsArtifactsManagementService.java @@ -67,49 +67,49 @@ import javax.ws.rs.core.Response; @Scope( name = "Create Event Stream Artifact", description = "Create Event Stream Artifact", - key = "perm:analytics:artifacts:stream", + key = "dm:an:artifacts:stream:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/stream/add"}), @Scope( name = "Delete Stream Artifact", description = "Delete Stream Artifact", - key = "perm:analytics:artifacts:stream:delete", + key = "dm:an:artifacts:stream:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/stream/delete"}), @Scope( name = "Create Event Receiver Artifact", description = "Create Event Receiver Artifact", - key = "perm:analytics:artifacts:receiver", + key = "dm:an:artifacts:rcv:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/receiver/add"}), @Scope( name = "Delete Receiver Artifact", description = "Delete Receiver Artifact", - key = "perm:analytics:artifacts:receiver:delete", + key = "dm:an:artifacts:rcv:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/receiver/delete"}), @Scope( name = "Create Event Publisher Artifact", description = "Create Event Publisher Artifact", - key = "perm:analytics:artifacts:publisher", + key = "dm:an:artifacts:pub:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/publisher/add"}), @Scope( name = "Delete Publisher Artifact", description = "Delete Publisher Artifact", - key = "perm:analytics:artifacts:publisher:delete", + key = "dm:an:artifacts:pub:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/publisher/delete"}), @Scope( name = "Create Siddhi Script Artifact", description = "Create Siddhi Script Artifact", - key = "perm:analytics:artifacts:siddhi", + key = "dm:an:artifacts:siddhi:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/siddhi-script/add"}), @Scope( name = "Delete Siddhi Script Artifact", description = "Delete Siddhi Script Artifact", - key = "perm:analytics:artifacts:siddhi:delete", + key = "dm:an:artifacts:siddhi:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/analytics/artifacts/siddhi-script/delete"}) } @@ -134,7 +134,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:stream" + value = "dm:an:artifacts:stream:add" )}) } ) @@ -192,7 +192,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:stream" + value = "dm:an:artifacts:stream:add" )}) } ) @@ -238,7 +238,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:stream:delete" + value = "dm:an:artifacts:stream:delete" )}) } ) @@ -291,7 +291,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:receiver" + value = "dm:an:artifacts:rcv:add" )}) } ) @@ -343,7 +343,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:receiver" + value = "dm:an:artifacts:rcv:add" )}) } ) @@ -390,7 +390,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:receiver:delete" + value = "dm:an:artifacts:rcv:delete" )}) } ) @@ -437,7 +437,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:publisher" + value = "dm:an:artifacts:pub:add" )}) } ) @@ -489,7 +489,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:publisher" + value = "dm:an:artifacts:pub:add" )}) } ) @@ -536,7 +536,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:publisher:delete" + value = "dm:an:artifacts:pub:delete" )}) } ) @@ -580,7 +580,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:siddhi" + value = "dm:an:artifacts:siddhi:add" )}) } ) @@ -631,7 +631,7 @@ public interface AnalyticsArtifactsManagementService { @Extension(properties = { @ExtensionProperty( name = Constants.SCOPE, - value = "perm:analytics:artifacts:siddhi:delete" + value = "dm:an:artifacts:siddhi:delete" ) }) } 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/ConfigurationManagementService.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/ConfigurationManagementService.java index b419564cc3..164d85371e 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/ConfigurationManagementService.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/ConfigurationManagementService.java @@ -67,14 +67,14 @@ import javax.ws.rs.core.Response; @Scope( name = "View configurations", description = "", - key = "perm:view-configuration", + key = "dm:conf:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/platform-configurations/view"} ), @Scope( name = "Manage configurations", description = "", - key = "perm:manage-configuration", + key = "dm:conf:manage", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/platform-configurations/manage"} ) @@ -93,7 +93,7 @@ public interface ConfigurationManagementService { tags = "Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:view-configuration") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:conf:view") }) } ) @@ -153,7 +153,7 @@ public interface ConfigurationManagementService { tags = "Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:manage-configuration") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:conf:manage") }) } ) 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/DeviceAgentService.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/DeviceAgentService.java index b6fb084e24..50f7c1e465 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/DeviceAgentService.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/DeviceAgentService.java @@ -75,35 +75,35 @@ import java.util.Map; @Scope( name = "Enroll Device", description = "Register a device", - key = "perm:device:enroll", + key = "dm:device:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/add"} ), @Scope( name = "Modify Device", description = "Modify a device", - key = "perm:device:modify", + key = "dm:device:modify", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/modify"} ), @Scope( name = "Disenroll Device", description = "Disenroll a device", - key = "perm:device:disenroll", + key = "dm:device:disenroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/remove"} ), @Scope( name = "Publish Event", description = "publish device event", - key = "perm:device:publish-event", + key = "dm:device:event:publish", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/event"} ), @Scope( name = "Getting Device Operation Details", description = "Getting Device Operation Details", - key = "perm:device:operations", + key = "dm:ops:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ) @@ -121,7 +121,7 @@ public interface DeviceAgentService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:enroll") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:enroll") }) } ) @@ -173,7 +173,7 @@ public interface DeviceAgentService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:disenroll") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:disenroll") }) } ) @@ -203,7 +203,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:modify") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:modify") }) } ) @@ -261,7 +261,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:publish-event") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:event:publish") }) }, nickname = "publishEventFromAgent" @@ -327,7 +327,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:publish-event") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:event:publish") }) }, nickname = "publishEventsByTypeAndDevice" @@ -394,7 +394,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:ops:view") }) } ) @@ -453,7 +453,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:ops:view") }) } ) @@ -511,7 +511,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:ops:view") }) } ) @@ -570,7 +570,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:modify") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:modify") }) } ) @@ -630,7 +630,7 @@ public interface DeviceAgentService { tags = "Device Agent Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:ops:view") }) } ) 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/DeviceEventManagementService.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/DeviceEventManagementService.java index 9bb14ff135..8d8ad05607 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/DeviceEventManagementService.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/DeviceEventManagementService.java @@ -69,14 +69,14 @@ import java.util.List; @Scope( name = "Add or Delete Event Definition for device type", description = "Add or Delete Event Definition for device type", - key = "perm:device-types:events", + key = "dm:device-type:event:modify", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/device-type/add"} ), @Scope( name = "Get Events Details of a Device Type", description = "Get Events Details of a Device Type", - key = "perm:device-types:events:view", + key = "dm:device-type:event:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ) @@ -98,7 +98,7 @@ public interface DeviceEventManagementService { tags = "Device Event Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:modify") }) } ) @@ -157,7 +157,7 @@ public interface DeviceEventManagementService { tags = "Device Event Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:modify") }) } ) @@ -209,7 +209,7 @@ public interface DeviceEventManagementService { // tags = "Device Event Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events:view") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:view") // }) // } // ) @@ -271,7 +271,7 @@ public interface DeviceEventManagementService { // tags = "Device Event Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events:view") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:view") // }) // } // ) @@ -327,7 +327,7 @@ public interface DeviceEventManagementService { // tags = "Device Event Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events:view") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:view") // }) // } // ) @@ -387,7 +387,7 @@ public interface DeviceEventManagementService { tags = "Device Event Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:events:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:event:view") }) } ) 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/DeviceManagementService.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/DeviceManagementService.java index e3d9416a2c..f4dd947cc2 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/DeviceManagementService.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/DeviceManagementService.java @@ -90,91 +90,91 @@ import java.util.Map; @Scope( name = "Getting Details of Registered Devices", description = "Getting Details of Registered Devices", - key = "perm:devices:view", + key = "dm:devices:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Details of a Device", description = "Getting Details of a Device", - key = "perm:devices:details", + key = "dm:devices:details", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Update the device specified by device id", description = "Update the device specified by device id", - key = "perm:devices:update", + key = "dm:devices:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Delete the device specified by device id", description = "Delete the device specified by device id", - key = "perm:devices:delete", + key = "dm:devices:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Feature Details of a Device", description = "Getting Feature Details of a Device", - key = "perm:devices:features", + key = "dm:devices:features:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Advanced Search for Devices", description = "Advanced Search for Devices", - key = "perm:devices:search", + key = "dm:devices:search", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Installed Application Details of a Device", description = "Getting Installed Application Details of a Device", - key = "perm:devices:applications", + key = "dm:devices:app:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Device Operation Details", description = "Getting Device Operation Details", - key = "perm:devices:operations", + key = "dm:devices:ops:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Get the details of the policy that is enforced on a device.", description = "Get the details of the policy that is enforced on a device.", - key = "perm:devices:effective-policy", + key = "dm:devices:policy:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Policy Compliance Details of a Device", description = "Getting Policy Compliance Details of a Device", - key = "perm:devices:compliance-data", + key = "dm:devices:compliance:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Change device status.", description = "Change device status.", - key = "perm:devices:change-status", + key = "dm:devices:status:change", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/change-status"} ), @Scope( name = "Enroll Device", description = "Register a device", - key = "perm:device:enroll", + key = "dm:device:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/add"} ), @Scope( name = "Viewing Enrollment Guide", description = "Show enrollment guide to users", - key = "perm:devices:enrollment-guide:view", + key = "dm:devices:enrollment-guide:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enrollment-guide/view"} ), @@ -195,7 +195,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -350,7 +350,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -426,7 +426,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -516,7 +516,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -604,7 +604,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -680,7 +680,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -758,7 +758,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:enrollment-guide:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:enrollment-guide:view") }) } ) @@ -809,7 +809,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -856,7 +856,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) }, nickname = "isEnrolledByType" @@ -913,7 +913,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -990,7 +990,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -1066,7 +1066,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:details") }) } ) @@ -1146,7 +1146,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:update") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:update") }) } ) @@ -1221,7 +1221,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:delete") }) }, nickname = "deleteDeviceByTypeAndId" @@ -1292,7 +1292,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:features") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:features:view") }) } ) @@ -1374,7 +1374,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:search") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:search") }) } ) @@ -1454,7 +1454,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:search") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:search") }) } ) @@ -1532,7 +1532,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:app:view") }) } @@ -1637,7 +1637,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:app:view") }) }) @ApiResponses( @@ -1701,7 +1701,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:ops:view") }) } ) @@ -1843,7 +1843,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:effective-policy") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:policy:view") }) } ) @@ -1932,7 +1932,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:compliance-data") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:compliance:view") }) } ) @@ -1979,7 +1979,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -2047,7 +2047,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -2117,7 +2117,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:change-status") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:status:change") }) } ) @@ -2193,7 +2193,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:ops:view") }) } ) @@ -2250,7 +2250,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -2319,7 +2319,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -2389,7 +2389,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:change-status") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:status:change") }) } ) @@ -2450,7 +2450,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:compliance-data") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:compliance:view") }) } ) @@ -2518,7 +2518,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:compliance-data") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:compliance:view") }) } ) @@ -2558,7 +2558,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:app:view") }) } ) @@ -2625,7 +2625,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:app:view") }) } ) @@ -2670,7 +2670,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:ops:view") }) } ) @@ -2722,7 +2722,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view") }) } ) @@ -2761,7 +2761,7 @@ public interface DeviceManagementService { notes = "Getting the default access token by using given client ID and the client secret value.", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device:enroll") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device:enroll") }) } ) 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/DeviceTypeManagementService.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/DeviceTypeManagementService.java index 73e99d1136..9f436a80e7 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/DeviceTypeManagementService.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/DeviceTypeManagementService.java @@ -68,28 +68,28 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting the Supported Device Platforms", description = "Getting the Supported Device Platforms", - key = "perm:device-types:types", + key = "dm:device-type:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/device-type/view"} ), @Scope( name = "Get Feature Details of a Device Type", description = "Get Feature Details of a Device Type", - key = "perm:device-types:features", + key = "dm:device-type:features:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/device-type/features/view"} ), @Scope( name = "Get Config Details of a Device Type", description = "Get Config Details of a Device Type", - key = "perm:device-types:configs", + key = "dm:device-type:conf:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/device-type/config/view"} ), @Scope( name = "Getting Details of Policies", description = "Getting Details of Policies", - key = "perm:policies:get-details", + key = "dm:device-type:policies:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/view"} ) @@ -111,7 +111,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:types") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:view") }) }, nickname = "getAllDeviceTypesPaginated" @@ -193,7 +193,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:types") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:view") }) }, nickname = "getDeviceTypeByDeviceTypeName" @@ -248,7 +248,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:features") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:features:view") }) } ) @@ -327,7 +327,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:configs") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:conf:view") }) } ) 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/GeoLocationBasedService.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/GeoLocationBasedService.java index 2c358382d8..a0ff8dda0d 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/GeoLocationBasedService.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/GeoLocationBasedService.java @@ -72,21 +72,21 @@ import java.util.List; @Scope( name = "View Analytics", description = "", - key = "perm:geo-service:analytics-view", + key = "dm:geo:an:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view-analytics"} ), @Scope( name = "Manage Alerts", description = "", - key = "perm:geo-service:alerts-manage", + key = "dm:geo:alerts:manage", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/manage-alerts"} ), @Scope( name = "Manage Geo Fences", description = "", - key = "perm:geo-service:geo-fence", + key = "dm:geo:geo-fence:manage", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/manage-geo-fence"} ) @@ -111,7 +111,7 @@ public interface GeoLocationBasedService { // tags = "Geo Service Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:analytics-view") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:an:view") // }) // } // ) @@ -180,7 +180,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:analytics-view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:an:view") }) } ) @@ -264,7 +264,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:analytics-view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:an:view") }) } ) @@ -381,7 +381,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -447,7 +447,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -500,7 +500,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -565,7 +565,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -618,7 +618,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -682,7 +682,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -735,7 +735,7 @@ public interface GeoLocationBasedService { // tags = "Geo Service Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") // }) // } // ) @@ -804,7 +804,7 @@ public interface GeoLocationBasedService { // tags = "Geo Service Management", // extensions = { // @Extension(properties = { -// @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") +// @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") // }) // } // ) @@ -863,7 +863,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -928,7 +928,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:alerts:manage") }) } ) @@ -978,7 +978,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:geo-fence") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:geo-fence:manage") }) } ) @@ -1020,7 +1020,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:geo-fence") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:geo-fence:manage") }) }, nickname = "getGeofenceByFenceId" @@ -1071,7 +1071,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:geo-fence") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:geo-fence:manage") }) } ) @@ -1123,7 +1123,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:geo-fence") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:geo-fence:manage") }) } ) @@ -1169,7 +1169,7 @@ public interface GeoLocationBasedService { tags = "Geo Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:geo-fence") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:geo:geo-fence:manage") }) } ) 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/GroupManagementService.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/GroupManagementService.java index 94cf447f92..63ce185bfa 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/GroupManagementService.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/GroupManagementService.java @@ -82,112 +82,105 @@ import java.util.List; @Scope( name = "Get the list of groups belongs to current user.", description = "Get the list of groups belongs to current user.", - key = "perm:groups:groups", + key = "gm:groups:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/view"} ), @Scope( name = "Get the count of groups belongs to current user.", description = "Get the count of groups belongs to current user.", - key = "perm:groups:count", + key = "gm:groups:count", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/view"} ), @Scope( name = "Add new device group to the system.", description = "Add new device group to the system.", - key = "perm:groups:add", + key = "gm:groups:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/add"} ), @Scope( name = "View group specified", description = "View group specified", - key = "perm:groups:groups-view", + key = "gm:groups:groups-view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/view"} ), @Scope( name = "Update a group", description = "Update a group", - key = "perm:groups:update", + key = "gm:groups:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/update"} ), @Scope( name = "Delete a group", description = "Delete a group", - key = "perm:groups:remove", + key = "gm:groups:remove", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/remove"} ), @Scope( name = "Manage group sharing with a user", description = "Manage group sharing with a user", - key = "perm:groups:share", + key = "gm:roles:share", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/share"} ), @Scope( name = "View list of roles of a device group", description = "View list of roles of a device group", - key = "perm:groups:roles", + key = "gm:roles:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/roles/view"} ), @Scope( name = "View list of devices in the device group", description = "View list of devices in the device group", - key = "perm:groups:devices", + key = "gm:devices:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/view"} ), @Scope( name = "View list of device count in the device group", description = "View list of device count in the device group", - key = "perm:groups:devices-count", + key = "gm:devices:count", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/view"} ), @Scope( name = "Add devices to group", description = "Add devices to group", - key = "perm:groups:devices-add", + key = "gm:devices:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/add"} ), @Scope( name = "Remove devices from group", description = "Remove devices from group", - key = "perm:groups:devices-remove", + key = "gm:devices:remove", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/remove"} ), @Scope( name = "Assign devices to groups", description = "Assign devices to groups", - key = "perm:groups:assign", + key = "gm:devices:assign", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/add"} ), @Scope( name = "List of groups that have the device", description = "List of groups that have the device", - key = "perm:groups:device", + key = "gm:groups:device:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/devices/view"} ), @Scope( name = "View whether the groups has relevant device types", description = "View whether the groups has relevant device types", - key = "perm:groups:devices-types", - roles = {"Internal/devicemgt-user"}, - permissions = {"/device-mgt/groups/devices/types"} - ), - @Scope( - name = "View whether the groups has relevant device types", - description = "View whether the groups has relevant device types", - key = "perm:groups:add", + key = "gm:devices-types:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/groups/device-types"} ) @@ -209,7 +202,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:view") }) }, nickname = "getGroupsWithFilter" @@ -284,7 +277,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:view") }) }, nickname = "getGroupsWithHierarchyNonAdmin" @@ -365,7 +358,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:count") }) }, nickname = "getGroupCountNonAdmin" @@ -411,7 +404,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:count") }) }, nickname = "getGroupCountNonAdmin" @@ -456,7 +449,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:add") }) }, nickname = "createGroupByGroupObject" @@ -525,7 +518,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:groups-view") }) } ) @@ -598,7 +591,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:groups-view") }) }, nickname = "getGroupByGroupNameFilter" @@ -665,7 +658,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:update") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:update") }) } ) @@ -723,7 +716,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:remove") }) } ) @@ -780,7 +773,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:share") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:roles:share") }) } ) @@ -837,7 +830,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:roles") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:roles:view") }) } ) @@ -889,7 +882,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices:view") }) } ) @@ -963,7 +956,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-count") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices:count") }) } ) @@ -1016,7 +1009,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-add") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices:add") }) } ) @@ -1072,7 +1065,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-remove") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices:remove") }) } ) @@ -1129,7 +1122,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:assign") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices:assign") }) } ) @@ -1184,7 +1177,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:device") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:device:view") }) }, nickname = "getGroupsNonAdmin" @@ -1246,7 +1239,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-types") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:devices-types:view") }) }, nickname = "getGroupByGroupNameFilter" @@ -1301,7 +1294,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:add") }) } ) 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/MetadataService.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/MetadataService.java index aa23780783..b8aca4c550 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/MetadataService.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/MetadataService.java @@ -73,28 +73,28 @@ import javax.ws.rs.core.Response; @Scope( name = "View metadata records", description = "View metadata records", - key = "perm:metadata:view", + key = "dm:metadata:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/metadata/view"} ), @Scope( name = "Create a metadata record", description = "Create a metadata record", - key = "perm:metadata:create", + key = "dm:metadata:create", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/metadata/create"} ), @Scope( name = "Update a metadata record", description = "Updating a specified metadata record", - key = "perm:metadata:update", + key = "dm:metadata:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/metadata/update"} ), @Scope( name = "Delete a metadata record", description = "Delete a specified metadata record", - key = "perm:metadata:remove", + key = "dm:metadata:remove", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/metadata/remove"} ) @@ -115,7 +115,7 @@ public interface MetadataService { tags = "Device Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:metadata:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:metadata:view") }) } ) @@ -171,7 +171,7 @@ public interface MetadataService { tags = "Device Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:metadata:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:metadata:view") }) } ) @@ -216,7 +216,7 @@ public interface MetadataService { tags = "Device Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:metadata:create") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:metadata:create") }) } ) @@ -267,7 +267,7 @@ public interface MetadataService { tags = "Device Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:metadata:update") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:metadata:update") }) } ) @@ -314,7 +314,7 @@ public interface MetadataService { tags = "Device Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:metadata:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:metadata:remove") }) } ) 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/NotificationManagementService.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/NotificationManagementService.java index fe2049bd55..3dad471bc0 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/NotificationManagementService.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/NotificationManagementService.java @@ -71,14 +71,14 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting All Device Notification Details", description = "Getting All Device Notification Details", - key = "perm:notifications:view", + key = "dm:notifications:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/notifications/view"} ), @Scope( name = "Updating the Device Notification Status", description = "Updating the Device Notification Status", - key = "perm:notifications:mark-checked", + key = "dm:notif:mark-checked", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/notifications/view"} ) @@ -99,7 +99,7 @@ public interface NotificationManagementService { tags = "Device Notification Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:notifications:view") }) } ) @@ -188,7 +188,7 @@ public interface NotificationManagementService { tags = "Device Notification Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:mark-checked") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:notif:mark-checked") }) } ) @@ -228,7 +228,7 @@ public interface NotificationManagementService { tags = "Device Notification Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:mark-checked") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:notif:mark-checked") }) } ) 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/PolicyManagementService.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/PolicyManagementService.java index ae7f541234..b4bfa14a73 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/PolicyManagementService.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/PolicyManagementService.java @@ -77,70 +77,70 @@ import java.util.List; @Scope( name = "Adding a Policy", description = "Adding a Policy", - key = "perm:policies:manage", + key = "pm:policies:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Getting Details of Policies", description = "Getting Details of Policies", - key = "perm:policies:get-details", + key = "pm:policies:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/view"} ), @Scope( name = "Getting Details of a Policy", description = "Getting Details of a Policy", - key = "perm:policies:get-policy-details", + key = "pm:policies:details:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/view"} ), @Scope( name = "Updating a Policy", description = "Updating a Policy", - key = "perm:policies:update", + key = "pm:policies:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Removing Multiple Policies", description = "Removing Multiple Policies", - key = "perm:policies:remove", + key = "pm:policies:remove", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Activating Policies", description = "Activating Policies", - key = "perm:policies:activate", + key = "pm:policies:activate", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Deactivating Policies", description = "Deactivating Policies", - key = "perm:policies:deactivate", + key = "pm:policies:deactivate", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Applying Changes on Policies", description = "Applying Changes on Policies", - key = "perm:policies:changes", + key = "pm:policies:change", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Updating the Policy Priorities", description = "Updating the Policy Priorities", - key = "perm:policies:priorities", + key = "pm:policies:priorities:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Fetching the Effective Policy", description = "Fetching the Effective Policy", - key = "perm:policies:effective-policy", + key = "pm:policies:effective-policy", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/policies/view"} ) @@ -166,7 +166,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:manage") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:add") }) } ) @@ -237,7 +237,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:manage") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:add") }) } ) @@ -306,7 +306,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-details") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view") }) } ) @@ -382,7 +382,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-policy-details") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:details:view") }) } ) @@ -451,7 +451,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:update") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:update") }) } ) @@ -520,7 +520,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:remove") }) } ) @@ -568,7 +568,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:activate") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:activate") }) } ) @@ -610,7 +610,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:deactivate") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:deactivate") }) } ) @@ -656,7 +656,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:changes") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:change") }) } ) @@ -684,7 +684,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:priorities") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:priorities:update") }) } ) @@ -720,7 +720,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:effective-policy") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:effective-policy") }) } ) @@ -790,7 +790,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-details") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view") }) }, nickname = "getPoliciesFilteredByType" @@ -874,7 +874,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-details") + @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view") }) } ) 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/RemoteSessionService.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/RemoteSessionService.java index 57c96dc373..508c29100c 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/RemoteSessionService.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/RemoteSessionService.java @@ -60,7 +60,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Remote Session Connection", description = "", - key = "perm:remote-session-service:connect", + key = "dm:remote:connect", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/remote-session"} ) @@ -85,7 +85,7 @@ public interface RemoteSessionService { tags = "Remote Session Service Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:remote-session-service:connect") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:remote:connect") }) } ) 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/ReportManagementService.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/ReportManagementService.java index b2d8bd1b65..f2c8447483 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/ReportManagementService.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/ReportManagementService.java @@ -70,7 +70,7 @@ import java.util.List; @Scope( name = "Getting Details of Registered Devices", description = "Getting Details of Registered Devices", - key = "perm:devices:view", + key = "rep:devices:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @@ -93,7 +93,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -177,7 +177,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -249,7 +249,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -327,7 +327,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -386,7 +386,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -436,7 +436,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -511,7 +511,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) @@ -579,7 +579,7 @@ public interface ReportManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") }) } ) 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/RoleManagementService.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/RoleManagementService.java index 8a3e4242cd..d0cee93215 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/RoleManagementService.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/RoleManagementService.java @@ -51,56 +51,56 @@ import java.util.List; @Scope( name = "Getting the List of Roles", description = "Getting the List of Roles", - key = "perm:roles:view", + key = "rm:roles:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Getting Permission Details of a Role", description = "Getting Permission Details of a Role", - key = "perm:roles:permissions", + key = "rm:roles:permissions:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Getting the List of Roles", description = "Getting the List of Roles", - key = "perm:roles:details", + key = "rm:roles:details:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Adding a Role", description = "Adding a Role", - key = "perm:roles:add", + key = "rm:roles:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Adding a combined Role", description = "Adding a combined Role", - key = "perm:roles:create-combined-role", + key = "rm:roles:combined:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Updating Role Details", description = "Updating Role Details", - key = "perm:roles:update", + key = "rm:roles:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Deleting a Role", description = "Deleting a Role", - key = "perm:roles:delete", + key = "rm:roles:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Adding Users to a Role", description = "Adding Users to a Role", - key = "perm:roles:add-users", + key = "rm:users:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/roles/manage"} ) @@ -122,7 +122,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:view") }) } ) @@ -198,7 +198,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:view") }) } ) @@ -296,7 +296,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:view") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:view") }) } ) @@ -382,7 +382,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:permissions") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:permissions:view") }) } ) @@ -457,7 +457,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:details") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:details:view") }) } ) @@ -531,7 +531,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:add") }) } ) @@ -593,7 +593,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:create-combined-role") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:combined:add") }) } ) @@ -657,7 +657,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:update") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:update") }) } ) @@ -727,7 +727,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:roles:delete") }) } ) @@ -779,7 +779,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add-users") + @ExtensionProperty(name = Constants.SCOPE, value = "rm:users:add") }) } ) 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/UserManagementService.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/UserManagementService.java index b6665cd9ec..70924123de 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/UserManagementService.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/UserManagementService.java @@ -80,91 +80,91 @@ import javax.ws.rs.core.Response; @Scope( name = "Adding a User", description = "Adding a User", - key = "perm:users:add", + key = "um:users:add", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Getting Details of a User", description = "Getting Details of a User", - key = "perm:users:details", + key = "um:users:details:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Updating Details of a User", description = "Updating Details of a User", - key = "perm:users:update", + key = "um:users:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Deleting a User", description = "Deleting a User", - key = "perm:users:delete", + key = "um:users:delete", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Getting the Role Details of a User", description = "Getting the Role Details of a User", - key = "perm:users:roles", + key = "um:roles:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting Details of Users", description = "Getting Details of Users", - key = "perm:users:user-details", + key = "um:users:user-details:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting the User Count", description = "Getting the User Count", - key = "perm:users:count", + key = "um:users:count", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting the User existence status", description = "Getting the User existence status", - key = "perm:users:is-exist", + key = "um:users:is-exist", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Searching for a User Name", description = "Searching for a User Name", - key = "perm:users:search", + key = "um:users:search", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/view"} ), @Scope( name = "Changing the User Password", description = "Adding a User", - key = "perm:users:credentials", + key = "um:users:cred:change", roles = {"Internal/devicemgt-user"}, permissions = {"/login"} ), @Scope( name = "Sending Enrollment Invitations to Users", description = "Sending Enrollment Invitations to Users", - key = "perm:users:send-invitation", + key = "um:users:invite", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Get activities", description = "Get activities", - key = "perm:get-activity", + key = "um:activity:get", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting the Permissions of the User", description = "Getting the Permissions of the User", - key = "perm:user:permission-view", + key = "um:users:permission:view", roles = {"Internal/devicemgt-user"}, permissions = {"/login"} ) @@ -187,7 +187,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:add") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:add") }) } ) @@ -246,7 +246,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:details:view") }) } ) @@ -317,7 +317,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:update") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:update") }) } ) @@ -384,7 +384,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:delete") }) } ) @@ -429,7 +429,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:roles") + @ExtensionProperty(name = Constants.SCOPE, value = "um:roles:view") }) } ) @@ -494,7 +494,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:user-details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:user-details:view") }) } ) @@ -572,7 +572,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:user-details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:user-details:view") }) }, nickname = "getUsersByFilter" @@ -658,7 +658,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:count") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:count") }) } ) @@ -694,7 +694,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:is-exist") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:is-exist") }) } ) @@ -738,7 +738,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:search") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:search") }) } ) @@ -817,7 +817,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:credentials") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:cred:change") }) } ) @@ -864,7 +864,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:send-invitation") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:invite") }) } ) @@ -907,7 +907,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:send-invitation") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:invite") }) } ) @@ -955,7 +955,7 @@ public interface UserManagementService { tags = "Activity Info Provider", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity") + @ExtensionProperty(name = Constants.SCOPE, value = "um:activity:get") }) } ) @@ -1031,7 +1031,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:details:view") }) } ) @@ -1091,7 +1091,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:details:view") }) } ) @@ -1147,7 +1147,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:details:view") }) } ) @@ -1203,7 +1203,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:user:permission-view") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:permission:view") }) } ) @@ -1250,7 +1250,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:user-details") + @ExtensionProperty(name = Constants.SCOPE, value = "um:users:user-details:view") }) } ) 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/WhiteLabelService.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/WhiteLabelService.java index ff989bf095..22544b9ff0 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/WhiteLabelService.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/WhiteLabelService.java @@ -67,14 +67,14 @@ import javax.ws.rs.core.Response; @Scope( name = "View Whitelabel", description = "View whitelabel details", - key = "perm:whitelabel:view", + key = "dm:whitelable:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/whitelabel/view"} ), @Scope( name = "Update Whitelabel", description = "Updating whitelabel", - key = "perm:whitelabel:update", + key = "dm:whitelable:update", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/whitelabel/update"} ), @@ -210,7 +210,7 @@ public interface WhiteLabelService { tags = "Tenant Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:whitelabel:update") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:whitelable:update") }) } ) @@ -250,7 +250,7 @@ public interface WhiteLabelService { tags = "Tenant Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:whitelabel:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:whitelable:view") }) } ) @@ -291,7 +291,7 @@ public interface WhiteLabelService { tags = "Tenant Metadata Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:whitelabel:update") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:whitelable:update") }) } ) 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/ApplicationManagementAdminService.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/ApplicationManagementAdminService.java index 2dbc5f4062..1cb5325dcc 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/ApplicationManagementAdminService.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/ApplicationManagementAdminService.java @@ -65,14 +65,14 @@ import javax.ws.rs.core.Response; @Scope( name = "Installing an Application (Internal API)", description = "Installing an Application (Internal API)", - key = "perm:applications:install", + key = "am:admin:app:install", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/applications/manage"} ), @Scope( name = "Uninstalling an Application (Internal API)", description = "Uninstalling an Application (Internal API)", - key = "perm:applications:uninstall", + key = "am:admin:app:uninstall", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/applications/manage"} ) @@ -94,7 +94,7 @@ public interface ApplicationManagementAdminService { tags = "Application Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:install") + @ExtensionProperty(name = Constants.SCOPE, value = "am:admin:app:install") }) } ) @@ -138,7 +138,7 @@ public interface ApplicationManagementAdminService { tags = "Application Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:uninstall") + @ExtensionProperty(name = Constants.SCOPE, value = "am:admin:app:uninstall") }) } ) 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/DeviceAccessAuthorizationAdminService.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/DeviceAccessAuthorizationAdminService.java index d361e5ccc1..e26e5bb29f 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/DeviceAccessAuthorizationAdminService.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/DeviceAccessAuthorizationAdminService.java @@ -65,7 +65,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Verify device authorization", description = "Verify device authorization", - key = "perm:authorization:verify", + key = "dm:authorization:verify", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/authorization/verify"} ) @@ -89,7 +89,7 @@ public interface DeviceAccessAuthorizationAdminService { tags = "Authorization Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:authorization:verify") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:authorization:verify") }) }) @@ -128,7 +128,7 @@ public interface DeviceAccessAuthorizationAdminService { tags = "Authorization Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:authorization:verify") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:authorization:verify") }) }) 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/DeviceAnalyticsArtifactUploaderAdminService.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/DeviceAnalyticsArtifactUploaderAdminService.java index bb88a87d26..889714066e 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/DeviceAnalyticsArtifactUploaderAdminService.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/DeviceAnalyticsArtifactUploaderAdminService.java @@ -55,7 +55,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Devicetype deployment", description = "Deploy devicetype", - key = "perm:devicetype:deployment", + key = "dm:device-type:deploy", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devicetype/deploy"} ) @@ -74,7 +74,7 @@ public interface DeviceAnalyticsArtifactUploaderAdminService { tags = "Devicetype Deployment Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devicetype:deployment") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:device-type:deploy") }) }) 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/DeviceManagementAdminService.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/DeviceManagementAdminService.java index 73d96fcfe1..9ebef18d15 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/DeviceManagementAdminService.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/DeviceManagementAdminService.java @@ -77,28 +77,28 @@ import java.util.List; @Scope( name = "Getting Details of a Device", description = "Getting Details of a Device", - key = "perm:admin:devices:view", + key = "dm:admin:devices:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Update the Device Owner", description = "Update the ownership of the device", - key = "perm:admin:devices:update-enrollment", + key = "dm:admin:enrollment:update", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/devices/update-enrollment"} ), @Scope( name = "Permanently Delete the device specified by device id", description = "Permanently Delete the device specified by device id", - key = "perm:devices:permanent-delete", + key = "dm:admin:devices:permanent-delete", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/devices/permanent-delete"} ), @Scope( name = "Get Usage of Devices", description = "Get Usage of Devices", - key = "perm:admin:usage:view", + key = "dm:admin:devices:usage:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/devices/usage/view"} ), @@ -117,7 +117,7 @@ public interface DeviceManagementAdminService { tags = "Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:devices:view") }) } ) @@ -211,7 +211,7 @@ public interface DeviceManagementAdminService { tags = "Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:devices:view") }) } ) @@ -264,7 +264,7 @@ public interface DeviceManagementAdminService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:update-enrollment") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:enrollment:update") }) } ) @@ -315,7 +315,7 @@ public interface DeviceManagementAdminService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:permanent-delete") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:devices:permanent-delete") }) } ) @@ -366,7 +366,7 @@ public interface DeviceManagementAdminService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = Constants.SCOPE, value = "and:devices:enroll") }) } ) @@ -425,7 +425,7 @@ public interface DeviceManagementAdminService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:usage:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:devices:usage:view") }) } ) 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 816f52dd6a..ed5add345b 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 @@ -73,21 +73,21 @@ import javax.ws.rs.core.Response; @Scope( name = "Manage a Device Type", description = "Add, Edit or View a Device Type", - key = "perm:admin:device-type", + key = "dm:admin:device-type:modify", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/device-type"} ), @Scope( name = "Getting Details of a Device Type", description = "Getting Details of a Device Type", - key = "perm:admin:device-type:view", + key = "dm:admin:device-type:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/device-type/view"} ), @Scope( name = "Add Device Type Config", description = "Add Platform Config of a Device Type", - key = "perm:admin:device-type:configs", + key = "dm:admin:device-type:conf:add", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/device-type/config"} ) @@ -105,7 +105,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:view") }) } ) @@ -159,7 +159,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:view") }) } ) @@ -212,7 +212,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -265,7 +265,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -321,7 +321,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type:configs") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:conf:add") }) } ) @@ -379,7 +379,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -433,7 +433,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -485,7 +485,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -539,7 +539,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) @@ -592,7 +592,7 @@ public interface DeviceTypeManagementAdminService { tags = "Device Type Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:device-type") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:device-type:modify") }) } ) 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/GroupManagementAdminService.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/GroupManagementAdminService.java index 93bc0fabc6..cec3ce0237 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/GroupManagementAdminService.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/GroupManagementAdminService.java @@ -75,21 +75,21 @@ import javax.ws.rs.core.Response; @Scope( name = "View groups", description = "", - key = "perm:admin-groups:view", + key = "gm:admin:groups:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/groups/view"} ), @Scope( name = "Count groups", description = "", - key = "perm:admin-groups:count", + key = "gm:admin:groups:count", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/groups/view"} ), @Scope( name = "Add groups", description = "", - key = "perm:admin-groups:add", + key = "gm:admin:groups:add", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/admin/groups/add"} ) @@ -106,7 +106,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:view") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:admin:groups:view") }) } ) @@ -182,7 +182,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:view") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:admin:groups:view") }) } ) @@ -266,7 +266,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:admin:groups:count") }) } ) @@ -318,7 +318,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:admin:groups:count") }) } ) @@ -369,7 +369,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:add") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:admin:groups:add") }) } ) @@ -439,7 +439,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") + @ExtensionProperty(name = Constants.SCOPE, value = "gm:groups:add") }) } ) 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/UserManagementAdminService.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/UserManagementAdminService.java index 3929f67b09..7e5e5ce232 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/UserManagementAdminService.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/UserManagementAdminService.java @@ -51,14 +51,14 @@ import javax.ws.rs.core.Response; @Scope( name = "View Users", description = "View Users", - key = "perm:admin-users:view", + key = "um:admin:users:view", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Delete Users Device Information", description = "Delete users device details", - key = "perm:admin-users:remove", + key = "um:admin:users:remove", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/users/manage"} ) @@ -84,7 +84,7 @@ public interface UserManagementAdminService { tags = "User Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-users:view") + @ExtensionProperty(name = Constants.SCOPE, value = "um:admin:users:view") }) } ) @@ -143,7 +143,7 @@ public interface UserManagementAdminService { tags = "Device details remove", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-users:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "um:admin:users:remove") }) } ) @@ -201,7 +201,7 @@ public interface UserManagementAdminService { tags = "Device details remove privacy compliance", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-users:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "um:admin:users:remove") }) } ) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/src/main/java/io/entgra/device/mgt/core/device/mgt/config/api/service/DeviceManagementConfigService.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/src/main/java/io/entgra/device/mgt/core/device/mgt/config/api/service/DeviceManagementConfigService.java index ad8b11b5a3..63467ddb28 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/src/main/java/io/entgra/device/mgt/core/device/mgt/config/api/service/DeviceManagementConfigService.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/src/main/java/io/entgra/device/mgt/core/device/mgt/config/api/service/DeviceManagementConfigService.java @@ -70,28 +70,28 @@ import java.util.List; @Scope( name = "View configurations", description = "", - key = "perm:view-configuration", + key = "dm:conf:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/platform-configurations/view"} ), @Scope( name = "Manage configurations", description = "", - key = "perm:manage-configuration", + key = "dm:conf:manage", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/platform-configurations/manage"} ), @Scope( name = "Getting Details of Device tenants", description = "Getting Details of Device tenants", - key = "perm:admin:tenant:view", + key = "admin:tenant:view", roles = {"Internal/devicemgt-user"}, permissions = {"/tenants/view"} ), @Scope( name = "Add a permission to the permission tree", description = "Add a permission to the permission tree", - key = "perm:admin:permissions:add", + key = "admin:permissions:add", roles = {"Internal/devicemgt-user"}, permissions = {"/permissions/add"} ) @@ -173,7 +173,7 @@ public interface DeviceManagementConfigService { tags = "Device Management Configuration", extensions = { @Extension(properties = { - @ExtensionProperty(name = "scope", value = "perm:manage-configuration") + @ExtensionProperty(name = "scope", value = "dm:conf:manage") }) } ) @@ -257,7 +257,7 @@ public interface DeviceManagementConfigService { tags = "Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = "scope", value ="perm:admin:tenant:view") + @ExtensionProperty(name = "scope", value ="admin:tenant:view") }) } ) @@ -305,7 +305,7 @@ public interface DeviceManagementConfigService { extensions = { @Extension(properties = { @ExtensionProperty(name = "scope", value = - "perm:admin:permissions:add") + "admin:permissions:add") }) } ) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/DeviceManagementConstants.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/DeviceManagementConstants.java index 770c6db022..ebf11e54ee 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/DeviceManagementConstants.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/DeviceManagementConstants.java @@ -38,7 +38,7 @@ public final class DeviceManagementConstants { private ConfigurationManagement(){ throw new AssertionError(); } - public static final String SCOPES_FOR_TOKEN = "perm:device:operations perm:device:publish-event perm:windows:enroll"; + public static final String SCOPES_FOR_TOKEN = "dm:ops:view dm:device:event:publish win:devices:enroll"; public static final String IOT_GATEWAY_HOST = "iot.gateway.host"; public static final String IOT_GATEWAY_HTTPS_PORT = "iot.gateway.https.port"; public static final String IOT_CORE_HOST = "iot.core.host"; 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 d17c6c8a4e..7f7f5324d9 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 @@ -68,103 +68,106 @@ "copyrightSuffix": " All Rights Reserved." }, "scopes": [ - "perm:sign-csr", - "perm:admin:devices:view", - "perm:admin:topics:view", - "perm:roles:add", - "perm:roles:add-users", - "perm:roles:update", - "perm:roles:permissions", - "perm:roles:details", - "perm:roles:view", - "perm:roles:create-combined-role", - "perm:roles:delete", - "perm:dashboard:vulnerabilities", - "perm:dashboard:non-compliant-count", - "perm:dashboard:non-compliant", - "perm:dashboard:by-groups", - "perm:dashboard:device-counts", - "perm:dashboard:feature-non-compliant", - "perm:dashboard:count-overview", - "perm:dashboard:filtered-count", - "perm:dashboard:details", - "perm:get-activity", - "perm:devices:delete", - "perm:devices:applications", - "perm:devices:effective-policy", - "perm:devices:compliance-data", - "perm:devices:features", - "perm:devices:operations", - "perm:devices:search", - "perm:devices:details", - "perm:devices:update", - "perm:devices:view", - "perm:view-configuration", - "perm:manage-configuration", - "perm:policies:remove", - "perm:policies:priorities", - "perm:policies:deactivate", - "perm:policies:get-policy-details", - "perm:policies:manage", - "perm:policies:activate", - "perm:policies:update", - "perm:policies:changes", - "perm:policies:get-details", - "perm:users:add", - "perm:users:details", - "perm:users:count", - "perm:users:delete", - "perm:users:roles", - "perm:users:user-details", - "perm:users:credentials", - "perm:users:search", - "perm:users:is-exist", - "perm:users:update", - "perm:users:send-invitation", - "perm:admin-users:view", - "perm:admin:devices:update-enrollment", - "perm:groups:devices", - "perm:groups:update", - "perm:groups:add", - "perm:groups:device", - "perm:groups:devices-count", - "perm:groups:remove", - "perm:groups:groups", - "perm:groups:groups-view", - "perm:groups:share", - "perm:groups:count", - "perm:groups:roles", - "perm:groups:devices-remove", - "perm:groups:devices-add", - "perm:groups:assign", - "perm:device-types:configs", - "perm:device-types:features", - "perm:device-types:types", - "perm:applications:install", - "perm:applications:uninstall", - "perm:admin-groups:count", - "perm:admin-groups:view", - "perm:notifications:mark-checked", - "perm:notifications:view", - "perm:admin:certificates:delete", - "perm:admin:certificates:details", - "perm:admin:certificates:view", - "perm:admin:certificates:add", - "perm:admin:certificates:verify", - "perm:admin", - "perm:devicetype:deployment", - "perm:device-types:events", - "perm:device-types:events:view", - "perm:admin:device-type", - "perm:admin:device-type:view", - "perm:admin:device-type:configs", - "perm:device:enroll", - "perm:geo-service:analytics-view", - "perm:geo-service:alerts-manage", - "perm:devices:permanent-delete", + "dm:sign-csr", + "dm:admin:devices:view", + "dm:admin:topics:view", + "rm:roles:add", + "rm:users:add", + "rm:roles:update", + "rm:roles:permissions:view", + "rm:roles:details:view", + "rm:roles:view", + "rm:roles:combined:add", + "rm:roles:delete", + "an:db:vulnerabilities", + "an:db:non-compliant:count", + "an:db:non-compliant", + "an:db:by-groups", + "an:db:device:count", + "an:db:feature-non-compliant", + "an:db:overview:count", + "an:db:filtered-count", + "an:db:details", + "dm:activity:get", + "dm:devices:delete", + "dm:devices:app:view", + "dm:devices:policy:view", + "dm:devices:compliance:view", + "dm:devices:features:view", + "dm:devices:ops:view", + "dm:devices:search", + "dm:devices:details", + "dm:devices:update", + "dm:devices:view", + "rep:devices:view", + "dm:conf:view", + "dm:conf:manage", + "pm:policies:remove", + "pm:policies:priorities:update", + "pm:policies:deactivate", + "pm:policies:details:view", + "pm:policies:add", + "pm:policies:activate", + "pm:policies:update", + "pm:policies:change", + "pm:policies:view", + "dm:device-type:policies:view", + "um:users:add", + "um:users:details:view", + "um:users:count", + "um:users:delete", + "um:roles:view", + "um:users:user-details:view", + "um:users:cred:change", + "um:users:search", + "um:users:is-exist", + "um:users:update", + "um:users:invite", + "um:admin:users:view", + "um:activity:get", + "dm:admin:enrollment:update", + "gm:devices:view", + "gm:groups:update", + "gm:groups:add", + "gm:groups:device:view", + "gm:devices:count", + "gm:groups:remove", + "gm:groups:view", + "gm:groups:groups-view", + "gm:roles:share", + "gm:groups:count", + "gm:roles:view", + "gm:devices:remove", + "gm:devices:add", + "gm:devices:assign", + "dm:device-type:conf:view", + "dm:device-type:features:view", + "dm:device-type:view", + "am:admin:app:install", + "am:admin:app:uninstall", + "gm:admin:groups:count", + "gm:admin:groups:view", + "dm:notif:mark-checked", + "dm:notifications:view", + "cm:cert:delete", + "cm:cert:details:get", + "cm:cert:view", + "cm:cert:add", + "cm:cert:verify", + "dm:admin", + "dm:device-type:deploy", + "dm:device-type:event:modify", + "dm:device-type:event:view", + "dm:admin:device-type:modify", + "dm:admin:device-type:view", + "dm:admin:device-type:conf:add", + "dm:device:enroll", + "dm:geo:an:view", + "dm:geo:alerts:manage", + "dm:admin:devices:permanent-delete", "appm:read", - "perm:enterprise:modify", - "perm:enterprise:view" + "and:enterprise:modify", + "and:enterprise:view" ], "isOAuthEnabled": true, "backendRestEndpoints": { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js index 2e604c3ad1..69995e840b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js @@ -408,8 +408,8 @@ deviceModule = function () { //noinspection JSUnresolvedFunction var jwtClient = JWTClientManagerService.getJWTClient(); // returning access token by JWT grant type - var deviceScope = "device_" + type.replace(" ", "") + "_" + deviceId + " perm:device:enroll " + - "perm:device:disenroll perm:device:modify perm:device:operations perm:device:publish-event"; + var deviceScope = "device_" + type.replace(" ", "") + "_" + deviceId + " dm:device:enroll " + + "dm:device:disenroll dm:device:modify dm:ops:view dm:device:event:publish"; var tokenInfo = jwtClient.getAccessToken(config.clientId, config.clientSecret, userName, deviceScope); config.accessToken = tokenInfo.getAccessToken(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/private/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/private/config.json index f5d01d0d77..9596bc2838 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/private/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/private/config.json @@ -3,14 +3,14 @@ "label": "Windows", "category": "mobile", "scopes" : [ - "perm:windows:enroll", - "perm:windows:lock-devices", - "perm:windows:ring", - "perm:windows:wipe", - "perm:windows:lock-reset", - "perm:windows:reboot", - "perm:windows:location", - "perm:windows:disenroll" + "win:devices:enroll", + "win:ops:lock-devices", + "win:ops:ring", + "win:ops:wipe", + "win:ops:lock-reset", + "win:ops:reboot", + "win:ops:location", + "win:ops:disenroll" ], "analyticsEnabled": "false", "groupingEnabled": "false", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.hbs index d93197ede7..410693a3b5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.hbs @@ -120,7 +120,7 @@ -d '{ "applicationName":"testme", "isAllowedToAllDomains":false, "tags":["device_agent"]}'

  • Generate Token

     - curl -k -d "grant_type=password&username=%username%&password=%password%&scope=perm:device:enroll perm:device:disenroll perm:device:modify perm:device:operations perm:device:publish-event" + curl -k -d "grant_type=password&username=%username%&password=%password%&scope=dm:device:enroll dm:device:disenroll dm:device:modify dm:ops:view dm:device:event:publish" -H "Authorization: Basic Base64(client_id:client_secret)" -H "Content-Type: application/x-www-form-urlencoded" {{httpsGateway}}/token
    • diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java index fc2300a7fd..c45d96abce 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/ConfigurationManagementService.java @@ -63,7 +63,7 @@ import javax.ws.rs.core.Response; @Scope( name = "View configurations", description = "", - key = "perm:sms-handler:view-configuration", + key = "conf:sms-handler:view", roles = {"Internal/devicemgt-user"}, permissions = {"/sms-handler/platform-configurations/view"} ) @@ -79,7 +79,7 @@ public interface ConfigurationManagementService { tags = "SMS Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SMSHandlerConstants.SCOPE, value = "perm:sms-handler:view-configuration") + @ExtensionProperty(name = SMSHandlerConstants.SCOPE, value = "conf:sms-handler:view") }) } ) 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 13553e3816..d0369c8431 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 @@ -173,200 +173,203 @@ true - perm:grafana:api:view - perm:app:review:view - perm:app:review:update - perm:app:publisher:service-provider:view - perm:app:publisher:service-provider:create - perm:app:publisher:service-provider:attach - perm:app:publisher:service-provider:detach - perm:app:publisher:service-provider:connect - perm:app:publisher:view - perm:app:publisher:update - perm:app:store:view - perm:app:store:modify - perm:app:subscription:install - perm:app:subscription:uninstall - perm:admin:app:review:update - perm:admin:app:review:view - perm:admin:app:publisher:update - perm:admin:app:review:update - perm:admin:app:subscription:view - perm:admin:app:subscription:modify - perm:device-types:types - perm:enterprise:modify - perm:enterprise:view - perm:android-work:customer - perm:android-work:admin - perm:application-command:modify - perm:sign-csr - perm:admin:devices:view - perm:admin:topics:view - perm:roles:add - perm:roles:add-users - perm:roles:update - perm:roles:permissions - perm:roles:details - perm:roles:view - perm:roles:create-combined-role - perm:roles:delete - perm:dashboard:vulnerabilities - perm:dashboard:non-compliant-count - perm:dashboard:non-compliant - perm:dashboard:by-groups - perm:dashboard:device-counts - perm:dashboard:feature-non-compliant - perm:dashboard:count-overview - perm:dashboard:filtered-count - perm:dashboard:details - perm:get-activity - perm:devices:delete - perm:devices:applications - perm:devices:effective-policy - perm:devices:compliance-data - perm:devices:features - perm:devices:operations - perm:devices:search - perm:devices:details - perm:devices:update - perm:devices:view - perm:devices:enrollment-guide:view - perm:view-configuration - perm:manage-configuration - perm:policies:remove - perm:policies:priorities - perm:policies:deactivate - perm:policies:get-policy-details - perm:policies:manage - perm:policies:activate - perm:policies:update - perm:policies:changes - perm:policies:get-details - perm:users:add - perm:users:details - perm:users:count - perm:users:delete - perm:users:roles - perm:users:user-details - perm:users:credentials - perm:users:search - perm:users:is-exist - perm:users:update - perm:users:send-invitation - perm:admin-users:view - perm:admin:devices:update-enrollment - perm:groups:devices - perm:groups:update - perm:groups:add - perm:groups:device - perm:groups:devices-count - perm:groups:devices-types - perm:groups:remove - perm:groups:groups - perm:groups:groups-view - perm:groups:share - perm:groups:count - perm:groups:roles - perm:groups:devices-remove - perm:groups:devices-add - perm:groups:assign - perm:device-types:configs - perm:device-types:features - perm:device-types:types - perm:applications:install - perm:applications:uninstall - perm:admin-groups:count - perm:admin-groups:view - perm:admin-groups:add - perm:notifications:mark-checked - perm:notifications:view - perm:admin:certificates:delete - perm:admin:certificates:details - perm:admin:certificates:view - perm:admin:certificates:add - perm:admin:certificates:verify - perm:admin - perm:devicetype:deployment - perm:device-types:events - perm:device-types:events:view - perm:admin:device-type - perm:admin:device-type:view - perm:admin:device-type:configs - perm:device:enroll - perm:geo-service:analytics-view - perm:geo-service:alerts-manage + grafana:api:view + am:store:app:review:view + am:store:app:review:update + am:pub:sp:app:view + am:pub:sp:create + am:pub:sp:attach + am:pub:sp:detach + am:pub:sp:connect + am:pub:app:view + am:pub:app:update + am:store:app:view + am:store:app:modify + am:store:app:sub:install + am:store:app:sub:uninstall + am:admin:pub:app:review:update + am:admin:pub:app:review:view + am:admin:pub:app:update + am:admin:store:app:review:update + am:admin:store:app:sub:view + am:admin:store:app:sub:modify + dm:device-type:view + and:enterprise:modify + and:enterprise:view + and:work:customer + and:work:admin + app:command:modify + dm:sign-csr + dm:admin:devices:view + dm:admin:topics:view + rm:roles:add + rm:users:add + rm:roles:update + rm:roles:permissions:view + rm:roles:details:view + rm:roles:view + rm:roles:combined:add + rm:roles:delete + an:db:vulnerabilities + an:db:non-compliant:count + an:db:non-compliant + an:db:by-groups + an:db:device:count + an:db:feature-non-compliant + an:db:overview:count + an:db:filtered-count + an:db:details + dm:activity:get + dm:devices:delete + dm:devices:app:view + dm:devices:policy:view + dm:devices:compliance:view + dm:devices:features:view + dm:devices:ops:view + dm:devices:search + dm:devices:details + dm:devices:update + dm:devices:view + dm:devices:enrollment-guide:view + rep:devices:view + dm:conf:view + dm:conf:manage + pm:policies:remove + pm:policies:priorities:update + pm:policies:deactivate + pm:policies:details:view + pm:policies:add + pm:policies:activate + pm:policies:update + pm:policies:change + pm:policies:view + dm:device-type:policies:view + um:users:add + um:users:details:view + um:users:count + um:users:delete + um:roles:view + um:users:user-details:view + um:users:cred:change + um:users:search + um:users:is-exist + um:users:update + um:users:invite + um:admin:users:view + um:activity:get + dm:admin:enrollment:update + gm:devices:view + gm:groups:update + gm:groups:add + gm:groups:device:view + gm:devices:count + gm:devices-types:view + gm:groups:remove + gm:groups:view + gm:groups:groups-view + gm:roles:share + gm:groups:count + gm:roles:view + gm:devices:remove + gm:devices:add + gm:devices:assign + dm:device-type:conf:view + dm:device-type:features:view + dm:device-type:view + am:admin:app:install + am:admin:app:uninstall + gm:admin:groups:count + gm:admin:groups:view + gm:admin:groups:add + dm:notif:mark-checked + dm:notifications:view + cm:cert:delete + cm:cert:details:get + cm:cert:view + cm:cert:add + cm:cert:verify + dm:admin + dm:device-type:deploy + dm:device-type:event:modify + dm:device-type:event:view + dm:admin:device-type:modify + dm:admin:device-type:view + dm:admin:device-type:conf:add + dm:device:enroll + dm:geo:an:view + dm:geo:alerts:manage appm:read - perm:devices:permanent-delete - perm:android:manage-configuration - perm:android:view-configuration - perm:user:permission-view - perm:ios:view-configuration - perm:ios:manage-configuration - perm:ios:dep-view - perm:ios:dep-add - perm:windows:view-configuration - perm:windows:manage-configuration - perm:android:lock-devices - perm:android:unlock-devices - perm:android:location - perm:android:clear-password - perm:android:control-camera - perm:android:enterprise-wipe - perm:android:wipe - perm:android:ring - perm:android:applications - perm:android:reboot - perm:android:change-LockTask - perm:android:mute - perm:android:configure-display-message - perm:android:send-app-restrictions - perm:android:file-transfer - perm:android:set-webclip - perm:android:set-password-policy - perm:android:change-lock-code - perm:android:upgrade-firmware - perm:android:send-notification - perm:geo-service:geo-fence - perm:whitelabel:view - perm:whitelabel:update - perm:metadata:view - perm:metadata:create - perm:metadata:update - perm:android:google-account - perm:android:update-default-sim - perm:android:google-account - perm:android:info - perm:windows:lock-devices - perm:windows:enroll - perm:windows:disenroll - perm:windows:wipe - perm:windows:ring - perm:windows:lock-reset - perm:windows:reboot - perm:windows:location - perm:admin:tenant:view - perm:admin:metadata:view - perm:admin:usage:view - perm:android:clear-application - perm:android:suspend-package - perm:android:alternate-install - perm:ios:lock - perm:ios:location - perm:ios:ring - perm:ios:clear-passcode - perm:ios:enterprise-wipe - perm:ios:notification - perm:ios:wipe-data - perm:ios:boolean-setting - perm:ios:wallpaper - perm:ios:app-attributes - perm:ios:app-configurations - perm:mac-os:restart - perm:mac-os:shut-down - perm:app:vpp:user:modify - perm:app:vpp:user:view - perm:app:vpp:asset:modify - perm:app:vpp:asset:view + dm:admin:devices:permanent-delete + and:conf:manage + and:conf:view + um:users:permission:view + ios:conf:view + ios:conf:manage + ios:dep:view + ios:dep:add + win:conf:view + win:conf:manage + and:ops:lock-devices + and:ops:unlock-devices + and:ops:location + and:ops:clear-password + and:ops:control-camera + and:ops:enterprise-wipe + and:ops:wipe + and:ops:ring + and:ops:app-list + and:ops:reboot + and:ops:change-LockTask + and:ops:mute + and:ops:conf-display-msg + and:ops:send-app-restrictions + and:ops:file-transfer + and:ops:set-webclip + and:ops:password-policy + and:ops:change-lock-code + and:ops:upgrade-firmware + and:ops:send-notif + dm:geo:geo-fence:manage + dm:whitelable:view + dm:whitelable:update + dm:metadata:view + dm:metadata:create + dm:metadata:update + and:ops:add-google-acc + and:ops:update-default-sim + and:ops:add-google-acc + and:ops:device-info + win:ops:lock-devices + win:devices:enroll + win:ops:disenroll + win:ops:wipe + win:ops:ring + win:ops:lock-reset + win:ops:reboot + win:ops:location + admin:tenant:view + dm:admin:metadata:view + dm:admin:devices:usage:view + and:ops:clear-app + and:ops:suspend-package + and:ops:alternate-install + ios:ops:lock + ios:ops:location + ios:ops:ring + ios:ops:clear-passcode + ios:ops:enterprise-wipe + ios:ops:notif + ios:ops:wipe + ios:ops:boolean-setting + ios:ops:wallpaper + ios:ops:app-attributes + ios:ops:app-conf + mac:ops:restart + mac:ops:shutdown + am:store:vpp:user:modify + am:store:vpp:user:view + am:store:vpp:assets:modify + am:store:vpp:assets:view device-mgt