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 admin login to tracker

Browse Source
This commit is contained in:
Rushdi 2022-05-17 22:45:40 +05:30
parent a521985e98
commit 35a5230ef7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,6 +476,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
JSONObject obj = new JSONObject(DeviceAPIClientServiceImpl.returnUser(currentUser));
log.info("=================");
log.info(currentUser);
log.info(obj.toString());
log.info("==================");
if(obj.has("error")){

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
View File

@ -176,7 +176,9 @@ public class TraccarClientImpl implements TraccarClient {
traccarUser.setId(obj.getInt("id"));
traccarUser.setName(obj.getString("name"));
traccarUser.setLogin(obj.getString("login"));
if(!obj.isNull("login")){
traccarUser.setLogin(obj.getString("login"));
}
traccarUser.setEmail(obj.getString("email"));
traccarUser.setDeviceLimit(obj.getInt("deviceLimit"));
traccarUser.setUserLimit(obj.getInt("userLimit"));