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

Merge pull request 'Fix to ignore devicetype check for webclip' (#287) from prathabanKavin/device-mgt-core:webclipfix into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/287
This commit is contained in:
Pahansith Gunathilake 2023-11-09 10:05:07 +00:00
commit 73bf440852
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java
View File

@ -177,23 +177,26 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
try { try {
// Only for iOS devices // Only for iOS devices
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
if (DeviceTypes.IOS.toString().equalsIgnoreCase(APIUtil.getDeviceTypeData(applicationDTO // Ignore checking device type if app is a web clip
.getDeviceTypeId()).getName())) { if(!applicationDTO.getType().equals("WEB_CLIP")){
// TODO: replace getAssetByAppId with the correct one in DAO if (DeviceTypes.IOS.toString().equalsIgnoreCase(APIUtil.getDeviceTypeData(applicationDTO
// Check if the app trying to subscribe is a VPP asset. .getDeviceTypeId()).getName())) {
VppAssetDTO storedAsset = vppApplicationDAO.getAssetByAppId(applicationDTO.getId(), tenantId); // TODO: replace getAssetByAppId with the correct one in DAO
if (storedAsset != null) { // This is a VPP asset // Check if the app trying to subscribe is a VPP asset.
List<VppUserDTO> users = new ArrayList<>(); VppAssetDTO storedAsset = vppApplicationDAO.getAssetByAppId(applicationDTO.getId(), tenantId);
List<Device> devices = applicationSubscriptionInfo.getDevices();// get if (storedAsset != null) { // This is a VPP asset
// subscribed device list, so that we can extract the users of those devices. List<VppUserDTO> users = new ArrayList<>();
for (Device device : devices) { List<Device> devices = applicationSubscriptionInfo.getDevices();// get
VppUserDTO user = vppApplicationDAO.getUserByDMUsername(device.getEnrolmentInfo() // subscribed device list, so that we can extract the users of those devices.
.getOwner(), PrivilegedCarbonContext.getThreadLocalCarbonContext() for (Device device : devices) {
.getTenantId(true)); VppUserDTO user = vppApplicationDAO.getUserByDMUsername(device.getEnrolmentInfo()
users.add(user); .getOwner(), PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getTenantId(true));
users.add(user);
}
VPPApplicationManager vppManager = APIUtil.getVPPManager();
vppManager.addAssociation(storedAsset, users);
} }
VPPApplicationManager vppManager = APIUtil.getVPPManager();
vppManager.addAssociation(storedAsset, users);
} }
} }
} catch (BadRequestException e) { } catch (BadRequestException e) {