removed oauth token sending as query param

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js

@@ -18,17 +18,27 @@
 
 function onRequest(context) {
     var log = new Log("stats.js");
+    var carbonServer = require("carbon").server;
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
+    var jwtService = carbonServer.osgiService(
-	if (tokenPair) {
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
-		var token = parse(tokenPair)["accessToken"];
+    var jwtClient = jwtService.getJWTClient();
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
-			"token="+ token +"&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+    var token = "";
-	}
+    if (encodedClientKeys) {
-
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js

@@ -18,17 +18,27 @@
 
 function onRequest(context) {
     var log = new Log("stats.js");
+    var carbonServer = require("carbon").server;
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
+    var jwtService = carbonServer.osgiService(
-	if (tokenPair) {
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
-		var token = parse(tokenPair)["accessToken"];
+    var jwtClient = jwtService.getJWTClient();
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
-			"token="+ token +"&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+    var token = "";
-	}
+    if (encodedClientKeys) {
-
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js

@@ -22,15 +22,23 @@ function onRequest(context) {
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-
+    var jwtService = carbonServer.osgiService(
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
-	if (tokenPair) {
+    var jwtClient = jwtService.getJWTClient();
-		var token = parse(tokenPair)["accessToken"];
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
+    var token = "";
-			"token=" + token + "&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+    if (encodedClientKeys) {
-	}
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
-
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }