From 637c014866c738fb08394bd4121c314636551978 Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Fri, 6 Jan 2017 10:15:21 +0530 Subject: [PATCH] Refactored scope strings --- .../mgt/jaxrs/api/CertificateMgtService.java | 4 +- .../CertificateManagementAdminService.java | 16 +++--- .../mgt/jaxrs/service/api/Dashboard.java | 36 ++++++------ .../service/api/DeviceManagementService.java | 36 ++++++------ .../api/DeviceTypeManagementService.java | 8 +-- .../service/api/GroupManagementService.java | 56 +++++++++---------- .../api/NotificationManagementService.java | 8 +-- .../service/api/PolicyManagementService.java | 36 ++++++------ .../service/api/RoleManagementService.java | 32 +++++------ .../service/api/UserManagementService.java | 44 +++++++-------- .../ApplicationManagementAdminService.java | 8 +-- .../admin/DeviceManagementAdminService.java | 4 +- .../admin/GroupManagementAdminService.java | 8 +-- .../api/admin/UserManagementAdminService.java | 4 +- 14 files changed, 150 insertions(+), 150 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java index 9fb7d0ccfb..2357d61044 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java @@ -40,7 +40,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Sign CSR", description = "Sign CSR", - key = "cdmf:sign-csr", + key = "perm:sign-csr", permissions = {"/device-mgt/certificates/manage"} ) } @@ -68,7 +68,7 @@ public interface CertificateMgtService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "cdmf:sign-csr") + @ExtensionProperty(name = SCOPE, value = "perm:sign-csr") }) } ) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java index df92a10eb3..69a10a16d8 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java @@ -43,25 +43,25 @@ import javax.ws.rs.core.Response; @Scope( name = "Adding a new SSL certificate", description = "Adding a new SSL certificate", - key = "cdmf:admin:certificates:add", + key = "perm:admin:certificates:add", permissions = {"/device-mgt/admin/certificates/add"} ), @Scope( name = "Getting Details of an SSL Certificate", description = "Getting Details of an SSL Certificate", - key = "cdmf:admin:certificates:details", + key = "perm:admin:certificates:details", permissions = {"/device-mgt/admin/certificates/details"} ), @Scope( name = "Getting Details of Certificates", description = "Getting Details of Certificates", - key = "cdmf:admin:certificates:view", + key = "perm:admin:certificates:view", permissions = {"/device-mgt/admin/certificates/view"} ), @Scope( name = "Deleting an SSL Certificate", description = "Deleting an SSL Certificate", - key = "cdmf:admin:certificates:delete", + key = "perm:admin:certificates:delete", permissions = {"/device-mgt/admin/certificates/delete"} ) } @@ -89,7 +89,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "cdmf:admin:certificates:add") + @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:add") }) } ) @@ -158,7 +158,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "cdmf:admin:certificates:details") + @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:details") }) } ) @@ -229,7 +229,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "cdmf:admin:certificates:view") + @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:view") }) } ) @@ -308,7 +308,7 @@ public interface CertificateManagementAdminService { tags = "Certificate Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "cdmf:admin:certificates:delete") + @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:delete") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java index 76aab15079..3a0564bb06 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java @@ -52,19 +52,19 @@ import javax.ws.rs.core.Response; @Scope( name = "Device Count Overview", description = "Device Count Overview", - key = "cdmf:dashboard:count-overview", + key = "perm:dashboard:count-overview", permissions = {"/device-mgt/dashboard/view"} ), @Scope( name = "Device Counts by Potential Vulnerabilities", description = "Device Counts by Potential Vulnerabilities", - key = "cdmf:dashboard:vulnerabilities", + key = "perm:dashboard:vulnerabilities", permissions = {"/device-mgt/dashboard/view"} ), @Scope( name = "Get the number of devices that have not complied to a policy", description = "Get the number of devices that have not complied to a policy", - key = "cdmf:dashboard:non-compliant", + key = "perm:dashboard:non-compliant", permissions = {"/device-mgt/dashboard/view"} ), @Scope( @@ -72,13 +72,13 @@ import javax.ws.rs.core.Response; + "potential vulnerability, platform, and ownership", description = "Get the number of devices for a given device type, such as connectivity status, " + "potential vulnerability, platform, and ownership", - key = "cdmf:dashboard:by-groups", + key = "perm:dashboard:by-groups", permissions = {"/device-mgt/dashboard/view"} ), @Scope( name = "Get the number of devices that have not complied to a given policy based on a particular", description = "Get the number of devices that have not complied to a given policy based on a particular", - key = "cdmf:dashboard:device-counts", + key = "perm:dashboard:device-counts", permissions = {"/device-mgt/dashboard/view"} ), @Scope( @@ -86,7 +86,7 @@ import javax.ws.rs.core.Response; + " device type.", description = "Get the number of devices that have not complied to a given policy based on a " + "particular device type.", - key = "cdmf:dashboard:filtered-count", + key = "perm:dashboard:filtered-count", permissions = {"/device-mgt/dashboard/view"} ), @Scope( @@ -94,19 +94,19 @@ import javax.ws.rs.core.Response; + " number of devices registered with WSO2 EMM.\n", description = "Get the number of devices that have not complied to a given policy over the total" + " number of devices registered with WSO2 EMM.\n", - key = "cdmf:dashboard:non-compliant-count", + key = "perm:dashboard:non-compliant-count", permissions = {"/device-mgt/dashboard/view"} ), @Scope( name = "Get device details of devices based on a particular device type.", description = "Get device details of devices based on a particular device type.", - key = "cdmf:dashboard:details", + key = "perm:dashboard:details", permissions = {"/device-mgt/dashboard/view"} ), @Scope( name = "Get device details of non-compliant devices which do not comply to a given policy.", description = "Get device details of non-compliant devices which do not comply to a given policy.", - key = "cdmf:dashboard:feature-non-compliant", + key = "perm:dashboard:feature-non-compliant", permissions = {"/device-mgt/dashboard/view"} ) } @@ -139,7 +139,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:count-overview") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:count-overview") }) } ) @@ -195,7 +195,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:vulnerabilities") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:vulnerabilities") }) } ) @@ -252,7 +252,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:non-compliant") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:non-compliant") }) } ) @@ -322,7 +322,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:by-groups") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:by-groups") }) } ) @@ -411,7 +411,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:device-counts") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:device-counts") }) } ) @@ -490,7 +490,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:filtered-count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:filtered-count") }) } ) @@ -582,7 +582,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:non-compliant-count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:non-compliant-count") }) } ) @@ -657,7 +657,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:details") }) } ) @@ -759,7 +759,7 @@ public interface Dashboard { tags = "Dashboard", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:dashboard:feature-non-compliant") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:feature-non-compliant") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index 3ea1cd7bf6..3df745d8a7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -70,55 +70,55 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting Details of Registered Devices", description = "Getting Details of Registered Devices", - key = "cdmf:devices:view", + key = "perm:devices:view", permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Details of a Device", description = "Getting Details of a Device", - key = "cdmf:devices:details", + key = "perm:devices:details", 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 = "cdmf:devices:delete", + key = "perm:devices:delete", permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Feature Details of a Device", description = "Getting Feature Details of a Device", - key = "cdmf:devices:features", + key = "perm:devices:features", permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Advanced Search for Devices", description = "Advanced Search for Devices", - key = "cdmf:devices:search", + key = "perm:devices:search", 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 = "cdmf:devices:applications", + key = "perm:devices:applications", permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Getting Device Operation Details", description = "Getting Device Operation Details", - key = "cdmf:devices:operations", + key = "perm:devices:operations", 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 = "cdmf:devices:effective-policy", + key = "perm:devices:effective-policy", 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 = "cdmf:devices:compliance-data", + key = "perm:devices:compliance-data", permissions = {"/device-mgt/devices/owning-device/view"} ) } @@ -139,7 +139,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") }) } ) @@ -264,7 +264,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details") }) } ) @@ -342,7 +342,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:delete") }) } ) @@ -414,7 +414,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:features") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:features") }) } ) @@ -503,7 +503,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:search") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:search") }) } ) @@ -580,7 +580,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:applications") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications") }) } @@ -683,7 +683,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:operations") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:operations") }) } ) @@ -794,7 +794,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:effective-policy") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:effective-policy") }) } ) @@ -883,7 +883,7 @@ public interface DeviceManagementService { tags = "Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:devices:compliance-data") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:compliance-data") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java index eca9527f5f..83566b6f12 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java @@ -60,13 +60,13 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting the Supported Device Platforms", description = "Getting the Supported Device Platforms", - key = "cdmf:device-types:types", + key = "perm:device-types:types", permissions = {"/device-mgt/devices/owning-device/view"} ), @Scope( name = "Get Feature Details of a Device Type", description = "Get Feature Details of a Device Type", - key = "cdmf:device-types:features", + key = "perm:device-types:features", permissions = {"/device-mgt/devices/owning-device/view"} ) } @@ -87,7 +87,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:device-types:types") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:types") }) } ) @@ -149,7 +149,7 @@ public interface DeviceTypeManagementService { tags = "Device Type Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:device-types:features") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:features") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java index d22b2883e9..51a6dae87c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java @@ -81,85 +81,85 @@ 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 = "cdmf:groups:groups", + key = "perm:groups:groups", 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 = "cdmf:groups:count", + key = "perm:groups:count", permissions = {"/device-mgt/groups/view"} ), @Scope( name = "Add new device group to the system.", description = "Add new device group to the system.", - key = "cdmf:groups:add", + key = "perm:groups:add", permissions = {"/device-mgt/groups/add"} ), @Scope( name = "View group specified", description = "View group specified", - key = "cdmf:groups:groups-view", + key = "perm:groups:groups-view", permissions = {"/device-mgt/groups/view"} ), @Scope( name = "Update a group", description = "Update a group", - key = "cdmf:groups:update", + key = "perm:groups:update", permissions = {"/device-mgt/groups/update"} ), @Scope( name = "Delete a group", description = "Delete a group", - key = "cdmf:groups:remove", + key = "perm:groups:remove", permissions = {"/device-mgt/groups/remove"} ), @Scope( name = "Manage group sharing with a user", description = "Manage group sharing with a user", - key = "cdmf:groups:share", + key = "perm:groups:share", 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 = "cdmf:groups:roles", + key = "perm:groups:roles", 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 = "cdmf:groups:devices", + key = "perm:groups:devices", 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 = "cdmf:groups:devices-count", + key = "perm:groups:devices-count", permissions = {"/device-mgt/groups/devices/view"} ), @Scope( name = "Add devices to group", description = "Add devices to group", - key = "cdmf:groups:devices-add", + key = "perm:groups:devices-add", permissions = {"/device-mgt/groups/devices/add"} ), @Scope( name = "Remove devices from group", description = "Remove devices from group", - key = "cdmf:groups:devices-remove", + key = "perm:groups:devices-remove", permissions = {"/device-mgt/groups/devices/remove"} ), @Scope( name = "Assign devices to groups", description = "Assign devices to groups", - key = "cdmf:groups:assign", + key = "perm:groups:assign", permissions = {"/device-mgt/groups/devices/add"} ), @Scope( name = "List of groups that have the device", description = "List of groups that have the device", - key = "cdmf:groups:device", + key = "perm:groups:device", permissions = {"/device-mgt/groups/devices/view"} ) } @@ -180,7 +180,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:groups") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups") }) } ) @@ -243,7 +243,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count") }) } @@ -291,7 +291,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:add") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") }) } ) @@ -357,7 +357,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:groups-view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view") }) } ) @@ -410,7 +410,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:update") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:update") }) } ) @@ -467,7 +467,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:remove") }) } ) @@ -519,7 +519,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:share") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:share") }) } ) @@ -575,7 +575,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:roles") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:roles") }) } ) @@ -627,7 +627,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:devices") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices") }) } ) @@ -687,7 +687,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:devices-count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-count") }) } ) @@ -739,7 +739,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:devices-add") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-add") }) } ) @@ -795,7 +795,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:devices-remove") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-remove") }) } ) @@ -851,7 +851,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:assign") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:assign") }) } ) @@ -903,7 +903,7 @@ public interface GroupManagementService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:groups:device") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:device") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java index 0463594290..62db9aacd8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java @@ -66,13 +66,13 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting All Device Notification Details", description = "Getting All Device Notification Details", - key = "cdmf:notifications:view", + key = "perm:notifications:view", permissions = {"/device-mgt/notifications/view"} ), @Scope( name = "Updating the Device Notification Status", description = "Updating the Device Notification Status", - key = "cdmf:notifications:mark-checked", + key = "perm:notifications:mark-checked", permissions = {"/device-mgt/notifications/view"} ) } @@ -92,7 +92,7 @@ public interface NotificationManagementService { tags = "Device Notification Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:notifications:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:view") }) } ) @@ -181,7 +181,7 @@ public interface NotificationManagementService { tags = "Device Notification Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:notifications:mark-checked") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:mark-checked") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java index 0b5ad17b49..91f2e07a59 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java @@ -68,55 +68,55 @@ import java.util.List; @Scope( name = "Adding a Policy", description = "Adding a Policy", - key = "cdmf:policies:manage", + key = "perm:policies:manage", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Getting Details of Policies", description = "Getting Details of Policies", - key = "cdmf:policies:get-details", + key = "perm:policies:get-details", permissions = {"/device-mgt/policies/view"} ), @Scope( name = "Getting Details of a Policy", description = "Getting Details of a Policy", - key = "cdmf:policies:get-policy-details", + key = "perm:policies:get-policy-details", permissions = {"/device-mgt/policies/view"} ), @Scope( name = "Updating a Policy", description = "Updating a Policy", - key = "cdmf:policies:update", + key = "perm:policies:update", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Removing Multiple Policies", description = "Removing Multiple Policies", - key = "cdmf:policies:remove", + key = "perm:policies:remove", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Activating Policies", description = "Activating Policies", - key = "cdmf:policies:activate", + key = "perm:policies:activate", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Deactivating Policies", description = "Deactivating Policies", - key = "cdmf:policies:deactivate", + key = "perm:policies:deactivate", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Applying Changes on Policies", description = "Applying Changes on Policies", - key = "cdmf:policies:changes", + key = "perm:policies:changes", permissions = {"/device-mgt/policies/manage"} ), @Scope( name = "Updating the Policy Priorities", description = "Updating the Policy Priorities", - key = "cdmf:policies:priorities", + key = "perm:policies:priorities", permissions = {"/device-mgt/policies/manage"} ) } @@ -138,7 +138,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:manage") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:manage") }) } ) @@ -206,7 +206,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:get-details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-details") }) } ) @@ -281,7 +281,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:get-policy-details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-policy-details") }) } ) @@ -349,7 +349,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:update") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:update") }) } ) @@ -417,7 +417,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:remove") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:remove") }) } ) @@ -463,7 +463,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:activate") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:activate") }) } ) @@ -504,7 +504,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:deactivate") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:deactivate") }) } ) @@ -550,7 +550,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:changes") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:changes") }) } ) @@ -578,7 +578,7 @@ public interface PolicyManagementService { tags = "Device Policy Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:policies:priorities") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:priorities") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java index 383c40e121..e330d7d3d3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java @@ -62,49 +62,49 @@ import java.util.List; @Scope( name = "Getting the List of Roles", description = "Getting the List of Roles", - key = "cdmf:roles:view", + key = "perm:roles:view", permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Getting Permission Details of a Role", description = "Getting Permission Details of a Role", - key = "cdmf:roles:permissions", + key = "perm:roles:permissions", permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Getting the List of Roles", description = "Getting the List of Roles", - key = "cdmf:roles:details", + key = "perm:roles:details", permissions = {"/device-mgt/roles/view"} ), @Scope( name = "Adding a Role", description = "Adding a Role", - key = "cdmf:roles:add", + key = "perm:roles:add", permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Adding a combined Role", description = "Adding a combined Role", - key = "cdmf:roles:create-combined-role", + key = "perm:roles:create-combined-role", permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Updating Role Details", description = "Updating Role Details", - key = "cdmf:roles:update", + key = "perm:roles:update", permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Deleting a Role", description = "Deleting a Role", - key = "cdmf:roles:delete", + key = "perm:roles:delete", permissions = {"/device-mgt/roles/manage"} ), @Scope( name = "Adding Users to a Role", description = "Adding Users to a Role", - key = "cdmf:roles:add-users", + key = "perm:roles:add-users", permissions = {"/device-mgt/roles/manage"} ) } @@ -125,7 +125,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:view") }) } ) @@ -205,7 +205,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:permissions") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:permissions") }) } ) @@ -280,7 +280,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:details") }) } ) @@ -354,7 +354,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:add") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add") }) } ) @@ -414,7 +414,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:create-combined-role") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:create-combined-role") }) } ) @@ -477,7 +477,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:update") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:update") }) } ) @@ -543,7 +543,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:delete") }) } ) @@ -593,7 +593,7 @@ public interface RoleManagementService { tags = "Role Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:roles:add-users") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add-users") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java index b97270b19f..1b9acd0c65 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java @@ -78,67 +78,67 @@ import java.util.List; @Scope( name = "Adding a User", description = "Adding a User", - key = "cdmf:users:add", + key = "perm:users:add", permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Getting Details of a User", description = "Getting Details of a User", - key = "cdmf:users:details", + key = "perm:users:details", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Updating Details of a User", description = "Updating Details of a User", - key = "cdmf:users:update", + key = "perm:users:update", permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Deleting a User", description = "Deleting a User", - key = "cdmf:users:delete", + key = "perm:users:delete", permissions = {"/device-mgt/users/manage"} ), @Scope( name = "Getting the Role Details of a User", description = "Getting the Role Details of a User", - key = "cdmf:users:roles", + key = "perm:users:roles", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting Details of Users", description = "Getting Details of Users", - key = "cdmf:users:user-details", + key = "perm:users:user-details", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting the User Count", description = "Getting the User Count", - key = "cdmf:users:count", + key = "perm:users:count", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Getting the User existence status", description = "Getting the User existence status", - key = "cdmf:users:is-exist", + key = "perm:users:is-exist", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Searching for a User Name", description = "Searching for a User Name", - key = "cdmf:users:search", + key = "perm:users:search", permissions = {"/device-mgt/users/view"} ), @Scope( name = "Changing the User Password", description = "Adding a User", - key = "cdmf:users:credentials", + key = "perm:users:credentials", permissions = {"/login"} ), @Scope( name = "Sending Enrollment Invitations to Users", description = "Sending Enrollment Invitations to Users", - key = "cdmf:users:send-invitation", + key = "perm:users:send-invitation", permissions = {"/device-mgt/users/manage"} ) } @@ -159,7 +159,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:add") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:add") }) } ) @@ -219,7 +219,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details") }) } ) @@ -290,7 +290,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:update") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:update") }) } ) @@ -355,7 +355,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:delete") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:delete") }) } ) @@ -398,7 +398,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:roles") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:roles") }) } ) @@ -460,7 +460,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:user-details") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:user-details") }) } ) @@ -531,7 +531,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:count") }) } ) @@ -566,7 +566,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:is-exist") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:is-exist") }) } ) @@ -609,7 +609,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:search") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:search") }) } ) @@ -686,7 +686,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:credentials") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:credentials") }) } ) @@ -731,7 +731,7 @@ public interface UserManagementService { tags = "User Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:users:send-invitation") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:send-invitation") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java index fdf51ec358..92c42bfb3b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java @@ -66,13 +66,13 @@ import javax.ws.rs.core.Response; @Scope( name = "Installing an Application (Internal API)", description = "Installing an Application (Internal API)", - key = "cdmf:applications:install", + key = "perm:applications:install", permissions = {"/device-mgt/applications/manage"} ), @Scope( name = "Uninstalling an Application (Internal API)", description = "Uninstalling an Application (Internal API)", - key = "cdmf:applications:uninstall", + key = "perm:applications:uninstall", permissions = {"/device-mgt/applications/manage"} ) } @@ -93,7 +93,7 @@ public interface ApplicationManagementAdminService { tags = "Application Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:applications:install") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:install") }) } ) @@ -137,7 +137,7 @@ public interface ApplicationManagementAdminService { tags = "Application Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:applications:uninstall") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:uninstall") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java index eb570819b4..14a34d3520 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java @@ -66,7 +66,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting Details of a Device", description = "Getting Details of a Device", - key = "cdmf:admin:devices:view", + key = "perm:admin:devices:view", permissions = {"/device-mgt/devices/owning-device/view"} ) } @@ -84,7 +84,7 @@ public interface DeviceManagementAdminService { tags = "Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:admin:devices:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:view") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java index 0188425051..64020ce56e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java @@ -67,13 +67,13 @@ import javax.ws.rs.core.Response; @Scope( name = "View groups", description = "", - key = "cdmf:admin-groups:view", + key = "perm:admin-groups:view", permissions = {"/device-mgt/admin/groups/view"} ), @Scope( name = "Count groups", description = "", - key = "cdmf:admin-groups:count", + key = "perm:admin-groups:count", permissions = {"/device-mgt/admin/groups/view"} ) } @@ -89,7 +89,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:admin-groups:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:view") }) } ) @@ -152,7 +152,7 @@ public interface GroupManagementAdminService { tags = "Device Group Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "cdmf:admin-groups:count") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:count") }) } ) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java index bef81df1a1..c6c7130926 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java @@ -59,7 +59,7 @@ import javax.ws.rs.core.Response; @Scope( name = "View Users", description = "View Users", - key = "cdmf:admin-users:view", + key = "perm:admin-users:view", 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 = "cdmf:admin-users:view") + @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-users:view") }) } )