community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified Android enrollment APIs and changed isRegistered to isEnrolled

Browse Source
This commit is contained in:
harshanL 2014-12-10 14:53:15 +05:30
parent 7eb5b960a9
commit 7c7768101f
7 changed files with 88 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagerService.java
View File

@ -65,7 +65,7 @@ public interface DeviceManagerService {
* @return Status of enrollment * @return Status of enrollment
* @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device * @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device
*/ */
boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException; boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException;
/** /**
* Method to retrieve the status of a particular device. * Method to retrieve the status of a particular device.

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManager.java
View File

@ -84,10 +84,10 @@ public class DeviceManager implements DeviceManagerService {
} }
@Override @Override
public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
DeviceManagerService dms = DeviceManagerService dms =
this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
return dms.isRegistered(deviceId); return dms.isEnrolled(deviceId);
} }
@Override @Override

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementService.java
View File

@ -46,8 +46,8 @@ public class DeviceManagementService implements DeviceManagerService {
} }
@Override @Override
public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
return DeviceManagementDataHolder.getInstance().getDeviceManager().isRegistered(deviceId); return DeviceManagementDataHolder.getInstance().getDeviceManager().isEnrolled(deviceId);
} }
@Override @Override

2
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java
View File

@ -50,7 +50,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
} }
@Override @Override
public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
return true; return true;
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/IOSDeviceManagerService.java
View File

@ -50,7 +50,7 @@ public class IOSDeviceManagerService implements DeviceManagerService {
} }
@Override @Override
public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
return true; return true;
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java
View File

@ -50,7 +50,7 @@ public class WindowsDeviceManagerService implements DeviceManagerService {
} }
@Override @Override
public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
return true; return true;
} }

102
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
View File

@ -36,66 +36,124 @@ import javax.ws.rs.core.Response;
public class Enrollment { public class Enrollment {
private static Log log = LogFactory.getLog(Enrollment.class); private static Log log = LogFactory.getLog(Enrollment.class);
@POST @POST
public Response enrollDevice() { public Response enrollDevice() {
JsonObject result = new JsonObject(); boolean result = false;
result.addProperty("senderId","jwwfowrjwqporqwrpqworpq"); int status = 0;
String msg = "";
CarbonContext context = CarbonContext.getThreadLocalCarbonContext(); CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null); DeviceManagementService dmService = (DeviceManagementService) context
Device device = AndroidAPIUtil.convertToDeviceObject(result); .getOSGiService(DeviceManagementService.class, null);
Device device = AndroidAPIUtil.convertToDeviceObject(null);
try { try {
dmService.enrollDevice(device); result = dmService.enrollDevice(device);
status = 1;
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error occurred while enrolling the device"; msg = "Error occurred while enrolling the device";
log.error(msg, e); log.error(msg, e);
status = -1;
} }
return Response.status(201).entity("Registration Successful").build(); switch (status) {
case 1:
if (result) {
return Response.status(201).entity("Registration Successful").build();
}
break;
case -1:
return Response.status(500).entity(msg).build();
}
return Response.status(400).entity("Registration Failed").build();
} }
@GET @GET
@Path("{id}") @Path("{id}")
public Response isEnrolled(@PathParam("id") String id) { public Response isEnrolled(@PathParam("id") String id) {
boolean status = false; boolean result = false;
int status = 0;
String msg = "";
CarbonContext context = CarbonContext.getThreadLocalCarbonContext(); CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null); DeviceManagementService dmService = (DeviceManagementService) context
.getOSGiService(DeviceManagementService.class, null);
try { try {
DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id); DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id);
status = dmService.isRegistered(deviceIdentifier); result = dmService.isEnrolled(deviceIdentifier);
status = 1;
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error occurred while checking enrollment of the device"; msg = "Error occurred while checking enrollment of the device";
log.error(msg, e); log.error(msg, e);
status = -1;
} }
return Response.status(200).entity(status).build(); switch (status) {
case 1:
if (result) {
return Response.status(200).entity(result).build();
}
break;
case -1:
return Response.status(500).entity(msg).build();
}
return Response.status(404).entity(result).build();
} }
@PUT @PUT
@Consumes("application/json") @Consumes("application/json")
@Path("{id}") @Path("{id}")
public Response modifyEnrollment(@PathParam("id") String id) { public Response modifyEnrollment(@PathParam("id") String id) {
boolean status = false; boolean result = false;
int status = 0;
String msg = "";
CarbonContext context = CarbonContext.getThreadLocalCarbonContext(); CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null); DeviceManagementService dmService = (DeviceManagementService) context
.getOSGiService(DeviceManagementService.class, null);
Device device = AndroidAPIUtil.convertToDeviceObject(null);
try { try {
status = dmService.isRegistered(null); result = dmService.modifyEnrollment(device);
status = 1;
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error occurred while modifying enrollment of the device"; msg = "Error occurred while modifying enrollment of the device";
log.error(msg, e); log.error(msg, e);
status = -1;
} }
return Response.status(201).entity(status).build(); switch (status) {
case 1:
if (result) {
return Response.status(200).entity("Device information modified").build();
}
break;
case -1:
return Response.status(500).entity(msg).build();
}
return Response.status(400).entity("Update enrollment failed").build();
} }
@DELETE @DELETE
@Path("{id}") @Path("{id}")
public Response disenrollDevice(@PathParam("id") String id) { public Response disenrollDevice(@PathParam("id") String id) {
boolean status = false; boolean result = false;
int status = 0;
String msg = "";
CarbonContext context = CarbonContext.getThreadLocalCarbonContext(); CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null); DeviceManagementService dmService = (DeviceManagementService) context
.getOSGiService(DeviceManagementService.class, null);
try { try {
status = dmService.isRegistered(null); DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id);
result = dmService.disenrollDevice(deviceIdentifier);
status = 1;
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error occurred while disenrolling the device"; msg = "Error occurred while disenrolling the device";
log.error(msg, e); log.error(msg, e);
status = -1;
} }
return Response.status(201).entity(status).build(); switch (status) {
case 1:
if (result) {
return Response.status(200).entity(result).build();
}
break;
case -1:
return Response.status(500).entity(msg).build();
}
return Response.status(404).entity("Device not found").build();
} }
} }