community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding correct tenant ID

Browse Source
This commit is contained in:
Ace 2018-10-18 11:55:20 +05:30
parent 92bf6f4140
commit 3f77a3b27c
1 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
View File

@ -63,12 +63,6 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
private static Log log = LogFactory.getLog(GeoLocationBasedServiceImpl.class); private static Log log = LogFactory.getLog(GeoLocationBasedServiceImpl.class);
public static final String EMAIL_DOMAIN_SEPARATOR = "@";
public static final String EMAIL_DOMAIN_SEPARATOR_REPLACEMENT = "-AT-";
public static final String SECONDERY_USER_STORE_SEPERATOR = ":";
public static final String SECONDERY_USER_STORE_DEFAULT_SEPERATOR = "/";
@Path("stats/{deviceType}/{deviceId}") @Path("stats/{deviceType}/{deviceId}")
@GET @GET
@Consumes("application/json") @Consumes("application/json")
@ -102,11 +96,11 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
sortByFields.add(sortByField); sortByFields.add(sortByField);
// this is the user who initiates the request // this is the user who initiates the request
String authorizedUser = CarbonContext.getThreadLocalCarbonContext().getUsername() + EMAIL_DOMAIN_SEPARATOR + String authorizedUser = MultitenantUtils.getTenantAwareUsername(
CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); CarbonContext.getThreadLocalCarbonContext().getUsername());
try { try {
String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser); String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
int tenantId = DeviceMgtAPIUtils.getRealmService().getTenantManager().getTenantId(tenantDomain); int tenantId = DeviceMgtAPIUtils.getRealmService().getTenantManager().getTenantId(tenantDomain);
AnalyticsDataAPI analyticsDataAPI = DeviceMgtAPIUtils.getAnalyticsDataAPI(); AnalyticsDataAPI analyticsDataAPI = DeviceMgtAPIUtils.getAnalyticsDataAPI();
List<SearchResultEntry> searchResults = analyticsDataAPI.search(tenantId, tableName, query, List<SearchResultEntry> searchResults = analyticsDataAPI.search(tenantId, tableName, query,
@ -583,43 +577,4 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
eventBean.setValues(record.getValues()); eventBean.setValues(record.getValues());
return eventBean; return eventBean;
} }
/**
* When an input is having '@',replace it with '-AT-' [This is required to
* persist WebApp data in registry,as registry paths don't allow '@' sign.]
*
* @param input inputString
* @return String modifiedString
*/
public static String replaceEmailDomain(String input) {
if (input != null && input.contains(EMAIL_DOMAIN_SEPARATOR)) {
input =
input.replace(EMAIL_DOMAIN_SEPARATOR,
EMAIL_DOMAIN_SEPARATOR_REPLACEMENT);
}
return input;
}
/**
* When an input is having '-AT-',replace it with @ [This is required to
* persist WebApp data between registry and database]
*
* @param input inputString
* @return String modifiedString
*/
public static String replaceEmailDomainBack(String input) {
if (input != null) {
if (input.contains(EMAIL_DOMAIN_SEPARATOR_REPLACEMENT)) {
input =
input.replace(EMAIL_DOMAIN_SEPARATOR_REPLACEMENT,
EMAIL_DOMAIN_SEPARATOR);
} else if (input.contains(SECONDERY_USER_STORE_SEPERATOR)) {
input =
input.replace(SECONDERY_USER_STORE_SEPERATOR,
SECONDERY_USER_STORE_DEFAULT_SEPERATOR);
}
}
return input;
}
} }