From 2ebc24985afc957fb33d413ae8130fdc1858897e Mon Sep 17 00:00:00 2001
From: Rushdi <rushdi@entgra.io>
Date: Wed, 27 Apr 2022 16:45:19 +0530
Subject: [PATCH] Create user when enrolling device

---
 .../TrackerAlreadyExistException.java         |   2 +-
 .../traccar/api/service/TraccarClient.java    |  13 +-
 ...ccarClient.java => TraccarClientImpl.java} | 168 ++++++++++++++++-
 .../impl/DeviceAPIClientServiceImpl.java      |  18 +-
 .../common/TraccarHandlerConstants.java       |   8 +
 .../traccar/common/beans/TraccarUser.java     | 175 ++++++++++++++++++
 6 files changed, 364 insertions(+), 20 deletions(-)
 rename components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/{ => exceptions}/TrackerAlreadyExistException.java (96%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/{TraccarClient.java => TraccarClientImpl.java} (73%)
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/beans/TraccarUser.java

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/TrackerAlreadyExistException.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/TrackerAlreadyExistException.java
similarity index 96%
rename from components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/TrackerAlreadyExistException.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/TrackerAlreadyExistException.java
index 45b8d31063..bf27865da9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/TrackerAlreadyExistException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/TrackerAlreadyExistException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 /**
  * This class represents a custom exception specified for group management
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClient.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClient.java
index 76cb22a8b9..1be320687b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClient.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClient.java
@@ -19,10 +19,12 @@
 
 package org.wso2.carbon.device.mgt.core.traccar.api.service;
 
-import org.wso2.carbon.device.mgt.common.TrackerAlreadyExistException;
+import org.json.JSONObject;
+import org.wso2.carbon.device.mgt.common.exceptions.TrackerAlreadyExistException;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarDevice;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarGroups;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarPosition;
+import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarUser;
 import org.wso2.carbon.device.mgt.core.traccar.common.config.TraccarConfigurationException;
 
 public interface TraccarClient {
@@ -45,4 +47,13 @@ public interface TraccarClient {
             throws TraccarConfigurationException, TrackerAlreadyExistException;
 
     void deleteGroup(int traccarGroupId, int tenantId) throws TraccarConfigurationException;
+
+    void fetchAllUsers(String createUser, TraccarUser traccarUser, int deviceId) throws TraccarConfigurationException;
+
+    void createUser(TraccarUser traccarUser, String method, int deviceId) throws TraccarConfigurationException;
+
+    void updateUser(JSONObject traccarUser) throws TraccarConfigurationException;
+
+    void setPermission(int userId, int deviceId) throws TraccarConfigurationException;
+
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClient.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
similarity index 73%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClient.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
index bcce5f4d87..124b16f044 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClient.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
@@ -19,6 +19,7 @@
 
 package org.wso2.carbon.device.mgt.core.traccar.api.service.addons;
 
+import com.google.gson.Gson;
 import okhttp3.ConnectionPool;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -27,19 +28,23 @@ import okhttp3.RequestBody;
 import okhttp3.Response;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.TrackerDeviceInfo;
 import org.wso2.carbon.device.mgt.common.TrackerGroupInfo;
 import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.TrackerAlreadyExistException;
+import org.wso2.carbon.device.mgt.common.exceptions.TrackerAlreadyExistException;
 import org.wso2.carbon.device.mgt.core.dao.TrackerManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.TrackerDAO;
 import org.wso2.carbon.device.mgt.core.dao.TrackerManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.traccar.api.service.TraccarClient;
 import org.wso2.carbon.device.mgt.core.traccar.common.TraccarHandlerConstants;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarDevice;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarGroups;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarPosition;
+import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarUser;
 import org.wso2.carbon.device.mgt.core.traccar.common.config.TraccarConfigurationException;
 import org.wso2.carbon.device.mgt.core.traccar.common.config.TraccarGateway;
 import org.wso2.carbon.device.mgt.core.traccar.core.config.TraccarConfigurationManager;
@@ -49,16 +54,16 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.api.service.TraccarClient {
-    private static final Log log = LogFactory.getLog(TraccarClient.class);
+public class TraccarClientImpl implements TraccarClient {
+    private static final Log log = LogFactory.getLog(TraccarClientImpl.class);
     private static final int THREAD_POOL_SIZE = 50;
     private final OkHttpClient client;
     private final ExecutorService executor = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
-
     final TraccarGateway traccarGateway = getTraccarGateway();
     final String endpoint = traccarGateway.getPropertyByName(TraccarHandlerConstants.TraccarConfig.ENDPOINT).getValue();
     final String authorization = traccarGateway.getPropertyByName(TraccarHandlerConstants.TraccarConfig.AUTHORIZATION).getValue();
@@ -66,9 +71,10 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
     final String defaultPort = traccarGateway.getPropertyByName(TraccarHandlerConstants.TraccarConfig.DEFAULT_PORT).getValue();
     final String locationUpdatePort = traccarGateway.getPropertyByName(TraccarHandlerConstants.TraccarConfig.LOCATION_UPDATE_PORT).getValue();
 
+    final String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
     private final TrackerDAO trackerDAO;
 
-    public TraccarClient() {
+    public TraccarClientImpl() {
         client = new OkHttpClient.Builder()
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .writeTimeout(30, TimeUnit.SECONDS)
@@ -123,7 +129,15 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
                 if(method==TraccarHandlerConstants.Methods.POST){
                     String result = response.body().string();
                     log.info(result);
-                    if(result.charAt(0)=='{'){
+                    if(type==TraccarHandlerConstants.Types.PERMISSION){
+                        String msg ="";
+                        if(result == ""){
+                            msg ="Successfully the device is assigned to the user";
+                        }else{
+                            msg = "Error occurred while fetching users .";
+                        }
+                        log.info(msg);
+                    }else if(result.charAt(0)=='{'){
                         JSONObject obj = new JSONObject(result);
                         if (obj.has("id")){
                             int traccarId = obj.getInt("id");
@@ -134,6 +148,20 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
                                     TrackerDeviceInfo res = trackerDAO.getTrackerDevice(deviceId, tenantId);
                                     if(res.getStatus()==0){
                                         trackerDAO.updateTrackerDeviceIdANDStatus(res.getTraccarDeviceId(), deviceId, tenantId, 1);
+
+                                        TraccarUser traccarUser = new TraccarUser();
+                                        traccarUser.setName(username);
+                                        traccarUser.setLogin(username);
+                                        traccarUser.setEmail(username);
+                                        traccarUser.setPassword(generateRandomString(10));
+                                        traccarUser.setToken(generateRandomString(32));
+                                        traccarUser.setDeviceLimit(-1);
+
+                                        log.info("=============================");
+                                        log.info(new Gson().toJson(traccarUser));
+                                        log.info("=============================");
+                                        fetchAllUsers(TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE, traccarUser, traccarId);
+
                                     }
                                 }else if(type==TraccarHandlerConstants.Types.GROUP){
                                     trackerDAO.addTrackerGroup(traccarId, groupId, tenantId);
@@ -141,6 +169,16 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
                                     if(res.getStatus()==0){
                                         trackerDAO.updateTrackerGroupIdANDStatus(res.getTraccarGroupId(), groupId, tenantId, 1);
                                     }
+                                }else if(type==TraccarHandlerConstants.Types.USER_CREATE){
+                                    log.info("=============");
+                                    log.info("User inserted");
+                                    log.info("=============");
+                                }else if(type==TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE){
+                                    int userId = traccarId;
+                                    log.info("=============");
+                                    log.info("User inserted and setting to create session");
+                                    log.info("=============");
+                                    setPermission(userId, deviceId);
                                 }
                                 TrackerManagementDAOFactory.commitTransaction();
                             } catch (JSONException e) {
@@ -158,6 +196,10 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
                                     msg = "Error occurred while mapping with deviceId .";
                                 }else if(type==TraccarHandlerConstants.Types.GROUP){
                                     msg = "Error occurred while mapping with groupId .";
+                                }else if(type==TraccarHandlerConstants.Types.USER){
+                                    msg = "Error occurred while fetching users .";
+                                }else if(type==TraccarHandlerConstants.Types.PERMISSION){
+                                    msg = "Error occurred while assigning the device to the user .";
                                 }
                                 log.error(msg, e);
                             } finally {
@@ -169,9 +211,55 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
                     if (log.isDebugEnabled()) {
                         log.debug("Successfully the request is proceed and communicated with Traccar");
                     }
+                }else if(method==TraccarHandlerConstants.Methods.GET){
+                    if(type!=TraccarHandlerConstants.Types.DEVICE){
+                        response = client.newCall(request).execute();
+                        String result = response.body().string();
+
+                        JSONArray fetchAllUsers = new JSONArray(result);
+                        int userAvailability = 0;
+                        for(int i=0; i<fetchAllUsers.length();i++){
+                            if(fetchAllUsers.getJSONObject(i).getString("login").equals(username)){
+
+                                //TODO :: when user is available then assgin the device to the user
+
+                                userAvailability=1;
+                                log.info(fetchAllUsers.getJSONObject(i));
+                                log.info(new Gson().toJson(fetchAllUsers.getJSONObject(i)));
+                                log.info("Username "+ fetchAllUsers.getJSONObject(i).getString("login")+"___"+username);
+                                log.info("Token: "+fetchAllUsers.getJSONObject(i).getString("token"));
+                                break;
+                            }
+                        }
+
+                        if(type==TraccarHandlerConstants.Types.USER_CREATE_WITH_INSERT_DEVICE){
+                            if(userAvailability==0){
+                                log.info("Creating User");
+                                log.info("============");
+                                log.info(payload);
+                                log.info("============");
+                                TraccarUser traccarUser = (TraccarUser) payload.get("data");
+                                log.info("============");
+                                log.info(traccarUser);
+                                log.info("============");
+                                createUser(traccarUser, type, deviceId);
+                                log.info("Creating User");
+
+                            }
+                        }else if(type==TraccarHandlerConstants.Types.USER_CREATE){
+                        /*if(userAvailability==1){
+                            log.info("Update User");
+                            log.info(payload);
+                            log.info(new Gson().toJson(payload));
+                            updateUser(payload);
+                            log.info("Update User");
+                        }*/
+                        }
+                    }
+
                 }
 
-            } catch (IOException e) {
+            } catch (IOException | TraccarConfigurationException e) {
                 log.error("Couldnt connect to traccar.", e);
             }
         }
@@ -306,7 +394,7 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
             String msg = "Error occurred establishing the DB connection .";
             log.error(msg, e);
         } catch (TrackerManagementDAOException e) {
-            String msg="Could not update the traccar group";
+            String msg="Could add new device location";
             log.error(msg, e);
         } finally{
             TrackerManagementDAOFactory.closeConnection();
@@ -316,7 +404,7 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
             try {
                 addDevice(device, tenantId);
             } catch (TraccarConfigurationException e) {
-                String msg = "Error occurred while mapping with groupId";
+                String msg = "Error occurred add the new device";
                 log.error(msg, e);
                 throw new TraccarConfigurationException(msg, e);
             } catch (TrackerAlreadyExistException e) {
@@ -513,6 +601,68 @@ public class TraccarClient implements org.wso2.carbon.device.mgt.core.traccar.ap
         }
     }
 
+    public void fetchAllUsers(String type, TraccarUser traccarUser, int deviceId) throws TraccarConfigurationException {
+        String context = defaultPort+"/api/users/";
+
+        JSONObject payload = new JSONObject();
+        payload.put("data", traccarUser);
+
+        Runnable trackerExecutor = new TrackerExecutor(deviceId, 0, endpoint, context,
+                payload, TraccarHandlerConstants.Methods.GET, type);
+        executor.execute(trackerExecutor);
+    }
+
+    private JSONObject TraccarUserPayload(TraccarUser traccarUser){
+        JSONObject payload = new JSONObject();
+        payload.put("name", traccarUser.getName());
+        payload.put("login", traccarUser.getLogin());
+        payload.put("email", traccarUser.getEmail());
+        payload.put("password", traccarUser.getPassword());
+        payload.put("token", traccarUser.getToken());
+        payload.put("administrator", traccarUser.getAdministrator());
+        payload.put("deviceLimit", traccarUser.getDeviceLimit());
+        payload.put("userLimit", traccarUser.getUserLimit());
+        payload.put("disabled", traccarUser.getDisabled());
+        payload.put("deviceReadonly", traccarUser.getDeviceReadonly());
+        return payload;
+    }
+    public void createUser(TraccarUser traccarUser, String type, int deviceId) throws TraccarConfigurationException {
+        JSONObject payload = TraccarUserPayload(traccarUser);
+        
+        String context = defaultPort+"/api/users";
+        Runnable trackerExecutor = new TrackerExecutor(deviceId, 0, endpoint, context, payload,
+                TraccarHandlerConstants.Methods.POST, type);
+        executor.execute(trackerExecutor);
+    }
+
+    public void updateUser(JSONObject traccarUser) throws TraccarConfigurationException {
+        /*JSONObject payload = traccarUser;
+        String context = defaultPort+"/api/users";
+        Runnable trackerExecutor = new TrackerExecutor(0, 0, endpoint, context, payload,
+                TraccarHandlerConstants.Methods.PUT, TraccarHandlerConstants.Types.USER);
+        executor.execute(trackerExecutor);*/
+    }
+
+    public void setPermission(int userId, int deviceId) throws TraccarConfigurationException {
+        JSONObject payload = new JSONObject();
+        payload.put("userId", userId);
+        payload.put("deviceId", deviceId);
+
+        String context = defaultPort+"/api/permissions";
+        Runnable trackerExecutor = new TrackerExecutor(deviceId, 0, endpoint, context, payload,
+                TraccarHandlerConstants.Methods.POST, TraccarHandlerConstants.Types.PERMISSION);
+        executor.execute(trackerExecutor);
+    }
+
+    public String generateRandomString(int len) {
+        String chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+        Random rnd = new Random();
+        StringBuilder sb = new StringBuilder(len);
+        for (int i = 0; i < len; i++)
+            sb.append(chars.charAt(rnd.nextInt(chars.length())));
+        return sb.toString();
+    }
+
     private TraccarGateway getTraccarGateway(){
         return TraccarConfigurationManager.getInstance().getTraccarConfig().getTraccarGateway(
                 TraccarHandlerConstants.TraccarConfig.GATEWAY_NAME);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/impl/DeviceAPIClientServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/impl/DeviceAPIClientServiceImpl.java
index 89fa2badbd..4c2ac044f8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/impl/DeviceAPIClientServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/impl/DeviceAPIClientServiceImpl.java
@@ -24,9 +24,9 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.device.mgt.common.TrackerAlreadyExistException;
+import org.wso2.carbon.device.mgt.common.exceptions.TrackerAlreadyExistException;
 import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientService;
-import org.wso2.carbon.device.mgt.core.traccar.api.service.addons.TraccarClient;
+import org.wso2.carbon.device.mgt.core.traccar.api.service.addons.TraccarClientImpl;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarDevice;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarGroups;
 import org.wso2.carbon.device.mgt.core.traccar.common.beans.TraccarPosition;
@@ -39,7 +39,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     private static final Log log = LogFactory.getLog(DeviceAPIClientServiceImpl.class);
 
     public void addDevice(Device device, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         String lastUpdatedTime = String.valueOf((new Date().getTime()));
         TraccarDevice traccarDevice = new TraccarDevice(device.getId(), device.getName(), device.getDeviceIdentifier(),
                 "online", "false", lastUpdatedTime, "", "", "", "",
@@ -56,7 +56,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void updateDevice(Device device, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         String lastUpdatedTime = String.valueOf((new Date().getTime()));
         TraccarDevice traccarDeviceInfo = new TraccarDevice(device.getId(), device.getName(), device.getDeviceIdentifier(),
                 "online", "false", lastUpdatedTime, "", "", "", "",
@@ -73,7 +73,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void updateLocation(Device device, DeviceLocation deviceLocation, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         TraccarPosition traccarPosition = new TraccarPosition(device.getDeviceIdentifier(),
                 deviceLocation.getUpdatedTime().getTime(),
                 deviceLocation.getLatitude(), deviceLocation.getLongitude(),
@@ -95,7 +95,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void disEndrollDevice(int deviceId, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         try {
             client.disEndrollDevice(deviceId, tenantId);
         } catch (TraccarConfigurationException e) {
@@ -105,7 +105,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void addGroup(DeviceGroup group, int groupId, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         TraccarGroups traccarGroups = new TraccarGroups(group.getName());
         try {
             client.addGroup(traccarGroups, groupId, tenantId);
@@ -119,7 +119,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void updateGroup(DeviceGroup group, int groupId, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         TraccarGroups traccarGroups = new TraccarGroups(group.getName());
         try {
             client.updateGroup(traccarGroups, groupId, tenantId);
@@ -133,7 +133,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
     }
 
     public void deleteGroup(int groupId, int tenantId) {
-        TraccarClient client = new TraccarClient();
+        TraccarClientImpl client = new TraccarClientImpl();
         try {
             client.deleteGroup(groupId, tenantId);
         } catch (TraccarConfigurationException e) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/TraccarHandlerConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/TraccarHandlerConstants.java
index d11024936e..2f5fb598be 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/TraccarHandlerConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/TraccarHandlerConstants.java
@@ -41,6 +41,14 @@ public class TraccarHandlerConstants {
     public static class Types {
         public static final String DEVICE = "DEVICE";
         public static final String GROUP = "GROUP";
+        public static final String USER = "USER";
+        public static final String PERMISSION = "PERMISSION";
+
+        public static final String USER_CREATE = "USER_CREATE";
+        public static final String USER_CREATE_WITH_INSERT_DEVICE = "USER_CREATE_WITH_INSERT_DEVICE";
+        public static final String USER_UPDATE = "USER_UPDATE";
+        public static final String USER_UPDATE_WITH_INSERT_DEVICE = "USER_UPDATE_WITH_INSERT_DEVICE";
+        public static final String USER_SEACRCH = "USER_SEACRCH";
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/beans/TraccarUser.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/beans/TraccarUser.java
new file mode 100644
index 0000000000..551658be72
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/beans/TraccarUser.java
@@ -0,0 +1,175 @@
+/*
+ *   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.core.traccar.common.beans;
+
+import java.io.Serializable;
+
+public class TraccarUser implements Serializable {
+
+    private static final long serialVersionUID = 1998101712L;
+
+    private int id;
+    private String name;
+    private String login;
+    private String email;
+    private String phone;
+    private Boolean readonly;
+    private Boolean administrator;
+    private Boolean disabled;
+    private String expirationTime;
+    private int deviceLimit;
+    private int userLimit;
+    private Boolean deviceReadonly;
+    private String token;
+    private String password;
+
+    public TraccarUser() {
+    }
+
+    public TraccarUser(String name, String login, String  email, String  phone, Boolean  readonly, Boolean  administrator,
+                       Boolean disabled, String expirationTime, int deviceLimit, int userLimit,
+                       Boolean deviceReadonly, String token, String password) {
+        this.name = name;
+        this.login = login;
+        this.email = email;
+        this.phone = phone;
+        this.readonly = readonly;
+        this.administrator = administrator;
+        this.disabled = disabled;
+        this.expirationTime = expirationTime;
+        this.deviceLimit = deviceLimit;
+        this.userLimit = userLimit;
+        this.deviceReadonly = deviceReadonly;
+        this.token = token;
+        this.password = password;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Boolean getReadonly() {
+        return readonly;
+    }
+
+    public void setReadonly(Boolean readonly) {
+        this.readonly = readonly;
+    }
+
+    public Boolean getAdministrator() {
+        return administrator;
+    }
+
+    public void setAdministrator(Boolean administrator) {
+        this.administrator = administrator;
+    }
+
+    public Boolean getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(Boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    public String getExpirationTime() {
+        return expirationTime;
+    }
+
+    public void setExpirationTime(String expirationTime) {
+        this.expirationTime = expirationTime;
+    }
+
+    public int getDeviceLimit() {
+        return deviceLimit;
+    }
+
+    public void setDeviceLimit(int deviceLimit) {
+        this.deviceLimit = deviceLimit;
+    }
+
+    public int getUserLimit() {
+        return userLimit;
+    }
+
+    public void setUserLimit(int userLimit) {
+        this.userLimit = userLimit;
+    }
+
+    public Boolean getDeviceReadonly() {
+        return deviceReadonly;
+    }
+
+    public void setDeviceReadonly(Boolean deviceReadonly) {
+        this.deviceReadonly = deviceReadonly;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}