community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Device dis-enrollment issue in APPM

Browse Source
This commit is contained in:
Shamalka Navod 2019-10-16 13:27:20 +00:00 committed by Dharmakeerthi Lasantha
parent f7596926dd
commit b291c814c4
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
View File

@ -919,10 +919,11 @@ public interface DeviceManagementService {
//device remove request would looks like follows //device remove request would looks like follows
//DELETE devices/type/virtual_firealarm/id/us06ww93auzp //DELETE devices/type/virtual_firealarm/id/us06ww93auzp
@DELETE @DELETE
@Consumes(MediaType.WILDCARD)
@Path("/type/{device-type}/id/{device-id}") @Path("/type/{device-type}/id/{device-id}")
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
consumes = MediaType.APPLICATION_JSON, consumes = MediaType.WILDCARD,
httpMethod = "DELETE", httpMethod = "DELETE",
value = "Remove the Device Specified by the Device ID", value = "Remove the Device Specified by the Device ID",
notes = "Returns the status of the deleted device operation and the details of the deleted device.", notes = "Returns the status of the deleted device operation and the details of the deleted device.",

1
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
View File

@ -333,6 +333,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
@DELETE @DELETE
@Consumes(MediaType.WILDCARD)
@Override @Override
@Path("/type/{device-type}/id/{device-id}") @Path("/type/{device-type}/id/{device-id}")
public Response deleteDevice(@PathParam("device-type") String deviceType, public Response deleteDevice(@PathParam("device-type") String deviceType,

1
features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml
View File

@ -256,6 +256,7 @@
<Scope>perm:geo-service:analytics-view</Scope> <Scope>perm:geo-service:analytics-view</Scope>
<Scope>perm:geo-service:alerts-manage</Scope> <Scope>perm:geo-service:alerts-manage</Scope>
<Scope>appm:rea</Scope> <Scope>appm:rea</Scope>
<Scope>perm:devices:permanent-delete</Scope>
</Scopes> </Scopes>
<SSOConfiguration> <SSOConfiguration>
<Issuer>app-mgt</Issuer> <Issuer>app-mgt</Issuer>