Merge pull request #889 from lasanthaDLPDS/master

Add device remote controlling for tenants

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js

@@ -189,14 +189,19 @@ function onRequest(context) {
         var jwtService = carbonServer.osgiService('org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
         var jwtClient = jwtService.getJWTClient();
         var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
+        var tokenPair = null;
         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 (context.user.domain == "carbon.super") {
+                tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+            } else {
+                tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + context.user.domain,"default", {});
+            }
             if (tokenPair) {
                 token = tokenPair.accessToken;
-                }
+            }
         }
         remoteSessionEndpoint = remoteSessionEndpoint + "/remote/session/clients/" + deviceType + "/" + deviceId +
         "?websocketToken=" + token