Addition of DeviceID and some UI Enhancements

devmgmtV2/controllers/dashboard.controller.js

@@ -8,6 +8,7 @@ const path = require('path');
 const exec = require('child_process').exec;
 
 const { config } = require('../config');
+let { selectFields } = require('dbsdk');
 
 let getInternetStatus = (req, res) => {
     dns.lookup('google.com', (err) => {
@@ -86,12 +87,31 @@ let getSystemVersion = (req,res) => {
     })
 }
 
+let getDeviceID = (req,res) => {
+    let responseData = {
+        retrieveSuccessful : true,
+        deviceID : undefined,
+        msg : 'Successfully retrieved Mac address'
+    }
+
+    selectFields({dbName : 'device_mgmt', tableName : 'device', columns : ["dev_id"]})
+        .then(response => {
+            responseData.deviceID = response[0].dev_id;
+            return res.status(200).json(responseData);
+        }, reject => {
+            responseData.retrieveSuccessful = false;
+            responseData.msg = err;
+            return res.status(200).json(responseData);
+        });
+}
+
 module.exports = {
     getInternetStatus,
     getLastRefresh,
     getNumberOfUsersConnected,
     getSystemMemory,
     getSystemSpace,
     getSystemCpu,
-    getSystemVersion
+    getSystemVersion,
+    getDeviceID
 }

devmgmtV2/init.sql

@@ -2,4 +2,5 @@ create database if not exists device_mgmt;
 create database if not exists test;
 
 use device_mgmt;
-CREATE TABLE if not exists users (id int(10) PRIMARY KEY AUTO_INCREMENT, username VARCHAR(100), password VARCHAR(100), permission VARCHAR(500), UNIQUE(username));
+CREATE TABLE if not exists users (id int(10) PRIMARY KEY AUTO_INCREMENT, username VARCHAR(100), password VARCHAR(100), permission VARCHAR(500), UNIQUE(username));
+CREATE TABLE if not exists device (dev_id VARCHAR(100), UNIQUE(dev_id));

devmgmtV2/middlewares/telemetry.middleware.js

@@ -5,11 +5,13 @@ const fs = require('fs');
 const path = require('path');
 const q = require('q');
 const exec = require('child_process').exec;
-const mac = require('getmac');
 
 const {
 	saveTelemetry
 } = require('../../telemetrysdk');
+let {
+	selectFields
+} = require('dbsdk');
 
 // Generic telemetry JSON structure
 const telemetryStructure = {
@@ -119,10 +121,10 @@ const addAgnosticDataAndSave = (telemetryData, actor, timestamp) => {
 				}
 			}
 
-			return _getMacAddr();
+			return _getDeviceID();
 		})
-        .then(macAddr => {
-			const deviceID = macAddr;
+        .then(response => {
+			const deviceID = response[0].dev_id;
 
 			telemetryData = {
 				...telemetryData,
@@ -164,17 +166,16 @@ const _formatTimestamp = timestamp => {
     return `${date} ${time}`;
 }
 
-const _getMacAddr = () => {
+const _getDeviceID = () => {
 	let defer = q.defer();
 
-	mac.getMac((err, addr) => {
-		if(err) {
-			console.log('Error encountered while fetching mac address.', err);
-			defer.reject(err);
-		} else {
-			defer.resolve(addr);
-		}
-	});
+	selectFields({dbName : 'device_mgmt', tableName : 'device', columns : ["dev_id"]})
+	.then(response => {
+		defer.resolve(response);
+	}).catch(e => {
+		console.log(e);
+		defer.reject(e);
+	})
 
     return defer.promise;
 }