Merge branch 'RemoteFix' into 'master'

Fix remote session failing issue

See merge request entgra/carbon-device-mgt!811
temp
Pahansith Gunathilake 3 years ago
commit 731ae83bc4

@ -127,8 +127,8 @@ public class DefaultTokenHandler extends HttpServlet {
URIBuilder ub = new URIBuilder(); URIBuilder ub = new URIBuilder();
ub.setScheme(HandlerConstants.WSS_PROTOCOL); ub.setScheme(HandlerConstants.WSS_PROTOCOL);
ub.setHost(System.getProperty(HandlerConstants.IOT_GW_HOST_ENV_VAR)); ub.setHost(System.getProperty(HandlerConstants.IOT_REMOTE_SESSION_HOST_ENV_VAR));
ub.setPort(Integer.parseInt(System.getProperty(HandlerConstants.IOT_GW_HTTPS_PORT_ENV_VAR))); ub.setPort(Integer.parseInt(System.getProperty(HandlerConstants.IOT_REMOTE_SESSION_HTTPS_PORT_ENV_VAR)));
ub.setPath(HandlerConstants.REMOTE_SESSION_CONTEXT); ub.setPath(HandlerConstants.REMOTE_SESSION_CONTEXT);
JsonObject responseJsonObj = new JsonObject(); JsonObject responseJsonObj = new JsonObject();

@ -86,6 +86,8 @@ public class HandlerConstants {
public static final String IOT_KM_HTTPS_PORT_ENV_VAR = "iot.keymanager.https.port"; public static final String IOT_KM_HTTPS_PORT_ENV_VAR = "iot.keymanager.https.port";
public static final String IOT_GW_HOST_ENV_VAR = "iot.gateway.host"; public static final String IOT_GW_HOST_ENV_VAR = "iot.gateway.host";
public static final String IOT_GW_HTTP_PORT_ENV_VAR = "iot.gateway.http.port"; public static final String IOT_GW_HTTP_PORT_ENV_VAR = "iot.gateway.http.port";
public static final String IOT_REMOTE_SESSION_HOST_ENV_VAR = "iot.remotesession.server.host";
public static final String IOT_REMOTE_SESSION_HTTPS_PORT_ENV_VAR = "iot.remotesession.server.https.port";
public static final String IOT_GW_HTTPS_PORT_ENV_VAR = "iot.gateway.https.port"; public static final String IOT_GW_HTTPS_PORT_ENV_VAR = "iot.gateway.https.port";
public static final String USER_SCOPES = "userScopes"; public static final String USER_SCOPES = "userScopes";
} }

Loading…
Cancel
Save