Merge pull request #496 from GPrathap/release-3.0.x

remove hardcoded oauth2 token

components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js

@@ -690,25 +690,26 @@ function intializeWebsocketUrls() {
         deviceId = state.device.id;
         deviceType = state.device.type;
         if (deviceId && deviceType) {
-            //TODO need to get the token
             wso2.gadgets.identity.getUsername(function (username) {
-                $.getJSON("/portal/store/carbon.super/fs/gadget/geo-dashboard/controllers/get_server_info.jag?username=" + username, function (data) {
-                    webSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
-                            .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
-                        ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
-                        + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
-                    alertWebSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
-                            .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
-                        ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
-                        + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
-                    document.cookie = "websocket-token=619e6170-10e8-31f0-904b-b7770d53e545; path=/";
-                    $("#proximity_alert").hide();
-                    initializeWebSocket();
-                    initializeOnAlertWebSocket();
+                wso2.gadgets.identity.getAccessToken(function (accessToken) {
+                    $.getJSON("/portal/store/carbon.super/fs/gadget/geo-dashboard/controllers/get_server_info.jag?username=" + username, function (data) {
+                        webSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
+                                .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
+                            ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
+                            + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
+                        alertWebSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
+                                .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
+                            ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
+                            + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
+                        document.cookie = "websocket-token="+accessToken+"; path=/";
+                        $("#proximity_alert").hide();
+                        initializeWebSocket();
+                        initializeOnAlertWebSocket();
+                    });
                 });
             });
         } else {