community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 27 Packages Projects Releases Wiki Activity

Duplicate keys for same permission in different files

Browse Source
pull/239/head
Viranga Gunarathna 1 year ago
parent 6c8c2efb80
commit 9e0427021e
6 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
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
Unescape View File

@ -89,7 +89,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Getting Details of Policies", name = "Getting Details of Policies",
description = "Getting Details of Policies", description = "Getting Details of Policies",
key = "dm:device-type:policies:view", key = "dm:policies:view",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/policies/view"} permissions = {"/device-mgt/policies/view"}
) )

8
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
Unescape View File

@ -84,7 +84,7 @@ import java.util.List;
@Scope( @Scope(
name = "Getting Details of Policies", name = "Getting Details of Policies",
description = "Getting Details of Policies", description = "Getting Details of Policies",
key = "pm:policies:view", key = "dm:policies:view",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/policies/view"} permissions = {"/device-mgt/policies/view"}
), ),
@ -306,7 +306,7 @@ public interface PolicyManagementService {
tags = "Device Policy Management", tags = "Device Policy Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Policy Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view") @ExtensionProperty(name = Constants.SCOPE, value = "dm:policies:view")
}) })
}, },
nickname = "getPoliciesFilteredByType" nickname = "getPoliciesFilteredByType"
@ -874,7 +874,7 @@ public interface PolicyManagementService {
tags = "Device Policy Management", tags = "Device Policy Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = Constants.SCOPE, value = "pm:policies:view") @ExtensionProperty(name = Constants.SCOPE, value = "dm:policies:view")
}) })
} }
) )

18
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
Unescape View File

@ -70,7 +70,7 @@ import java.util.List;
@Scope( @Scope(
name = "Getting Details of Registered Devices", name = "Getting Details of Registered Devices",
description = "Getting Details of Registered Devices", description = "Getting Details of Registered Devices",
key = "rep:devices:view", key = "dm:devices:view",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/owning-device/view"} permissions = {"/device-mgt/devices/owning-device/view"}
), ),
@ -93,7 +93,7 @@ public interface ReportManagementService {
tags = "Device Management", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @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", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = Constants.SCOPE, value = "rep:devices:view") @ExtensionProperty(name = Constants.SCOPE, value = "dm:devices:view")
}) })
} }
) )

4
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
Unescape View File

@ -157,7 +157,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Get activities", name = "Get activities",
description = "Get activities", description = "Get activities",
key = "um:activity:get", key = "dm:activity:get",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/owning-device/view"} permissions = {"/device-mgt/devices/owning-device/view"}
), ),
@ -955,7 +955,7 @@ public interface UserManagementService {
tags = "Activity Info Provider", tags = "Activity Info Provider",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = Constants.SCOPE, value = "um:activity:get") @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get")
}) })
} }
) )

5
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
Unescape View File

@ -99,7 +99,6 @@
"dm:devices:details", "dm:devices:details",
"dm:devices:update", "dm:devices:update",
"dm:devices:view", "dm:devices:view",
"rep:devices:view",
"dm:conf:view", "dm:conf:view",
"dm:conf:manage", "dm:conf:manage",
"pm:policies:remove", "pm:policies:remove",
@ -110,8 +109,7 @@
"pm:policies:activate", "pm:policies:activate",
"pm:policies:update", "pm:policies:update",
"pm:policies:change", "pm:policies:change",
"pm:policies:view", "dm:policies:view",
"dm:device-type:policies:view",
"um:users:add", "um:users:add",
"um:users:details:view", "um:users:details:view",
"um:users:count", "um:users:count",
@ -124,7 +122,6 @@
"um:users:update", "um:users:update",
"um:users:invite", "um:users:invite",
"um:admin:users:view", "um:admin:users:view",
"um:activity:get",
"dm:admin:enrollment:update", "dm:admin:enrollment:update",
"gm:devices:view", "gm:devices:view",
"gm:groups:update", "gm:groups:update",

5
features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
Unescape View File

@ -231,7 +231,6 @@
<Scope>dm:devices:update</Scope> <Scope>dm:devices:update</Scope>
<Scope>dm:devices:view</Scope> <Scope>dm:devices:view</Scope>
<Scope>dm:devices:enrollment-guide:view</Scope> <Scope>dm:devices:enrollment-guide:view</Scope>
<Scope>rep:devices:view</Scope>
<Scope>dm:conf:view</Scope> <Scope>dm:conf:view</Scope>
<Scope>dm:conf:manage</Scope> <Scope>dm:conf:manage</Scope>
<Scope>pm:policies:remove</Scope> <Scope>pm:policies:remove</Scope>
@ -242,8 +241,7 @@
<Scope>pm:policies:activate</Scope> <Scope>pm:policies:activate</Scope>
<Scope>pm:policies:update</Scope> <Scope>pm:policies:update</Scope>
<Scope>pm:policies:change</Scope> <Scope>pm:policies:change</Scope>
<Scope>pm:policies:view</Scope> <Scope>dm:policies:view</Scope>
<Scope>dm:device-type:policies:view</Scope>
<Scope>um:users:add</Scope> <Scope>um:users:add</Scope>
<Scope>um:users:details:view</Scope> <Scope>um:users:details:view</Scope>
<Scope>um:users:count</Scope> <Scope>um:users:count</Scope>
@ -256,7 +254,6 @@
<Scope>um:users:update</Scope> <Scope>um:users:update</Scope>
<Scope>um:users:invite</Scope> <Scope>um:users:invite</Scope>
<Scope>um:admin:users:view</Scope> <Scope>um:admin:users:view</Scope>
<Scope>um:activity:get</Scope>
<Scope>dm:admin:enrollment:update</Scope> <Scope>dm:admin:enrollment:update</Scope>
<Scope>gm:devices:view</Scope> <Scope>gm:devices:view</Scope>
<Scope>gm:groups:update</Scope> <Scope>gm:groups:update</Scope>

Write Preview
Loading…
Cancel
Save