Merge pull request #241 from ayyoob/transport

Few fixes after testing
revert-70aa11f8
Milan Perera 9 years ago
commit fb9c824e40

@ -83,7 +83,7 @@ public class DeviceDataPublisher {
* *
*/ */
public DataPublisher getDataPublisher() throws DataPublisherConfigurationException { public DataPublisher getDataPublisher() throws DataPublisherConfigurationException {
String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true);
//Get LoadBalancingDataPublisher which has been registered for the tenant. //Get LoadBalancingDataPublisher which has been registered for the tenant.
DataPublisher dataPublisher = getDataPublisher(tenantDomain); DataPublisher dataPublisher = getDataPublisher(tenantDomain);
//If a LoadBalancingDataPublisher had not been registered for the tenant. //If a LoadBalancingDataPublisher had not been registered for the tenant.

@ -73,7 +73,7 @@ public class JWTClientUtil {
private static final Log log = LogFactory.getLog(JWTClientUtil.class); private static final Log log = LogFactory.getLog(JWTClientUtil.class);
private static final String HTTPS_PROTOCOL = "https"; private static final String HTTPS_PROTOCOL = "https";
private static final String TENANT_JWT_CONFIG_LOCATION = "/jwt-config/jwt.properties"; private static final String TENANT_JWT_CONFIG_LOCATION = File.separator + "jwt-config" + File.separator + "jwt.properties";
private static final String JWT_CONFIG_FILE_NAME = "jwt.properties"; private static final String JWT_CONFIG_FILE_NAME = "jwt.properties";
private static final String SUPERTENANT_JWT_CONFIG_LOCATION = private static final String SUPERTENANT_JWT_CONFIG_LOCATION =
CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + JWT_CONFIG_FILE_NAME; CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + JWT_CONFIG_FILE_NAME;

@ -19,7 +19,7 @@
#issuer of the JWT #issuer of the JWT
iss=CDMF_DEFAULT_IDP iss=CDMF_DEFAULT_IDP
TokenEndpoint=https://${server.host}:${mgt.transport.https.port}/oauth2/token TokenEndpoint=https://localhost:${carbon.https.port}/oauth2/token
#audience of JWT claim #audience of JWT claim
#comma seperated values #comma seperated values

Loading…
Cancel
Save