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 9f436a80e7..9236bb9790 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
@@ -89,7 +89,7 @@ import javax.ws.rs.core.Response;
@Scope(
name = "Getting Details of Policies",
description = "Getting Details of Policies",
- key = "dm:device-type:policies:view",
+ key = "dm:policies:view",
roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/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/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 b4bfa14a73..bcdb180e3d 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
@@ -84,7 +84,7 @@ import java.util.List;
@Scope(
name = "Getting Details of Policies",
description = "Getting Details of Policies",
- key = "pm:policies:view",
+ key = "dm:policies:view",
roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/policies/view"}
),
@@ -306,7 +306,7 @@ public interface PolicyManagementService {
tags = "Device Policy Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:policies:view")
})
}
)
@@ -790,7 +790,7 @@ public interface PolicyManagementService {
tags = "Device Policy Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:policies:view")
})
},
nickname = "getPoliciesFilteredByType"
@@ -874,7 +874,7 @@ public interface PolicyManagementService {
tags = "Device Policy Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm: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/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 f2c8447483..e22f938684 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 = "rep:devices:view",
+ key = "dm: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 = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -177,7 +177,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -249,7 +249,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -327,7 +327,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -386,7 +386,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -436,7 +436,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -511,7 +511,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
})
}
)
@@ -579,7 +579,7 @@ public interface ReportManagementService {
tags = "Device Management",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm: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/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 70924123de..ded3961a62 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
@@ -157,7 +157,7 @@ import javax.ws.rs.core.Response;
@Scope(
name = "Get activities",
description = "Get activities",
- key = "um:activity:get",
+ key = "dm:activity:get",
roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/owning-device/view"}
),
@@ -955,7 +955,7 @@ public interface UserManagementService {
tags = "Activity Info Provider",
extensions = {
@Extension(properties = {
- @ExtensionProperty(name = Constants.SCOPE, value = "um:activity:get")
+ @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get")
})
}
)
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 7f7f5324d9..0d6874aa66 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
@@ -99,7 +99,6 @@
"dm:devices:details",
"dm:devices:update",
"dm:devices:view",
- "rep:devices:view",
"dm:conf:view",
"dm:conf:manage",
"pm:policies:remove",
@@ -110,8 +109,7 @@
"pm:policies:activate",
"pm:policies:update",
"pm:policies:change",
- "pm:policies:view",
- "dm:device-type:policies:view",
+ "dm:policies:view",
"um:users:add",
"um:users:details:view",
"um:users:count",
@@ -124,7 +122,6 @@
"um:users:update",
"um:users:invite",
"um:admin:users:view",
- "um:activity:get",
"dm:admin:enrollment:update",
"gm:devices:view",
"gm:groups:update",
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 bfe8dd6406..612bb39ec4 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
@@ -231,7 +231,6 @@
dm:devices:update
dm:devices:view
dm:devices:enrollment-guide:view
- rep:devices:view
dm:conf:view
dm:conf:manage
pm:policies:remove
@@ -242,8 +241,7 @@
pm:policies:activate
pm:policies:update
pm:policies:change
- pm:policies:view
- dm:device-type:policies:view
+ dm:policies:view
um:users:add
um:users:details:view
um:users:count
@@ -256,7 +254,6 @@
um:users:update
um:users:invite
um:admin:users:view
- um:activity:get
dm:admin:enrollment:update
gm:devices:view
gm:groups:update