|
|
@ -73,6 +73,7 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
|
|
|
|
sessionQueryParamList.add(session.getQueryString());
|
|
|
|
sessionQueryParamList.add(session.getQueryString());
|
|
|
|
sessionQueryParam.put(RemoteSessionConstants.QUERY_STRING, sessionQueryParamList);
|
|
|
|
sessionQueryParam.put(RemoteSessionConstants.QUERY_STRING, sessionQueryParamList);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if session initiated using operation id means request came from device.
|
|
|
|
if (operationId == null) {
|
|
|
|
if (operationId == null) {
|
|
|
|
// Validate the token
|
|
|
|
// Validate the token
|
|
|
|
OAuthAuthenticator oAuthAuthenticator = RemoteSessionManagementDataHolder.getInstance().getOauthAuthenticator();
|
|
|
|
OAuthAuthenticator oAuthAuthenticator = RemoteSessionManagementDataHolder.getInstance().getOauthAuthenticator();
|
|
|
@ -102,16 +103,8 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
|
|
|
|
.getMaxMessageBufferSize());
|
|
|
|
.getMaxMessageBufferSize());
|
|
|
|
session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout());
|
|
|
|
session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout());
|
|
|
|
|
|
|
|
|
|
|
|
// if session initiated using operation id means request came from device
|
|
|
|
initializeClientSession(session, authenticationInfo.getTenantDomain(), deviceType, deviceId);
|
|
|
|
// if (operationId != null) {
|
|
|
|
|
|
|
|
// // create new device session
|
|
|
|
|
|
|
|
// initializeDeviceSession(session, authenticationInfo.getTenantDomain(), deviceType, deviceId,
|
|
|
|
|
|
|
|
// operationId);
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// create new client session
|
|
|
|
|
|
|
|
initializeClientSession(session, authenticationInfo.getTenantDomain(), deviceType,
|
|
|
|
|
|
|
|
deviceId);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
log.info("Current remote sessions count: " + RemoteSessionManagementDataHolder.getInstance()
|
|
|
|
log.info("Current remote sessions count: " + RemoteSessionManagementDataHolder.getInstance()
|
|
|
|
.getSessionMap().size());
|
|
|
|
.getSessionMap().size());
|
|
|
|
|
|
|
|
|
|
|
@ -304,10 +297,11 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
|
|
|
|
JSONObject payload = new JSONObject();
|
|
|
|
JSONObject payload = new JSONObject();
|
|
|
|
payload.put("serverUrl", RemoteSessionManagementDataHolder.getInstance().getServerUrl());
|
|
|
|
payload.put("serverUrl", RemoteSessionManagementDataHolder.getInstance().getServerUrl());
|
|
|
|
payload.put("uuidToValidateDevice", uuidToValidateDevice);
|
|
|
|
payload.put("uuidToValidateDevice", uuidToValidateDevice);
|
|
|
|
String uuidToTenantMap = RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap
|
|
|
|
RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap
|
|
|
|
().putIfAbsent(uuidToValidateDevice, tenantDomain);
|
|
|
|
().put(uuidToValidateDevice, tenantDomain);
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug("UUID " + uuidToTenantMap + " is generated against the tenant : " + tenantDomain);
|
|
|
|
log.debug("UUID " + uuidToValidateDevice + " is generated against the tenant : " +
|
|
|
|
|
|
|
|
RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap().get(uuidToValidateDevice));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
operation.setPayLoad(payload.toString());
|
|
|
|
operation.setPayLoad(payload.toString());
|
|
|
|
String date = new SimpleDateFormat(RemoteSessionConstants.DATE_FORMAT_NOW).format(new Date());
|
|
|
|
String date = new SimpleDateFormat(RemoteSessionConstants.DATE_FORMAT_NOW).format(new Date());
|
|
|
|