|
|
|
@ -22,9 +22,7 @@ import com.google.gson.Gson;
|
|
|
|
|
import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException;
|
|
|
|
|
import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger;
|
|
|
|
|
import io.entgra.device.mgt.core.notification.logger.AppInstallLogContext;
|
|
|
|
|
import io.entgra.device.mgt.core.notification.logger.PolicyLogContext;
|
|
|
|
|
import io.entgra.device.mgt.core.notification.logger.impl.EntgraAppInstallLoggerImpl;
|
|
|
|
|
import io.entgra.device.mgt.core.notification.logger.impl.EntgraPolicyLoggerImpl;
|
|
|
|
|
import org.apache.commons.httpclient.HttpClient;
|
|
|
|
|
import org.apache.commons.httpclient.HttpException;
|
|
|
|
|
import org.apache.commons.httpclient.HttpMethodBase;
|
|
|
|
@ -701,14 +699,14 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
|
|
|
|
|
entry.getKey(), action, properties);
|
|
|
|
|
activityList.add(activity);
|
|
|
|
|
for (DeviceIdentifier identifier : deviceIdentifiers) {
|
|
|
|
|
log.info(String.format("Web app %s triggered", action), appInstallLogContextBuilder.setAppId(String.valueOf(applicationDTO.getId())).setAppName(applicationDTO.getName()).setTenantId(tenantId).setDevice(String.valueOf(identifier)).setUserName(username).setAction(action).build());
|
|
|
|
|
log.info(String.format("Web app %s triggered", action), appInstallLogContextBuilder.setAppId(String.valueOf(applicationDTO.getId())).setAppName(applicationDTO.getName()).setAppType(applicationDTO.getType()).setTenantId(tenantId).setDevice(String.valueOf(identifier)).setUserName(username).setAction(action).build());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Activity activity = addAppOperationOnDevices(applicationDTO, deviceIdentifiers, deviceType, action, properties);
|
|
|
|
|
activityList.add(activity);
|
|
|
|
|
for (DeviceIdentifier identifier : deviceIdentifiers) {
|
|
|
|
|
log.info(String.format("App %s triggered", action), appInstallLogContextBuilder.setAppId(String.valueOf(applicationDTO.getId())).setAppName(applicationDTO.getName()).setTenantId(tenantId).setDevice(String.valueOf(identifier)).setUserName(username).setAction(action).build());
|
|
|
|
|
log.info(String.format("App %s triggered", action), appInstallLogContextBuilder.setAppId(String.valueOf(applicationDTO.getId())).setAppName(applicationDTO.getName()).setAppType(applicationDTO.getType()).setTenantId(tenantId).setDevice(String.valueOf(identifier)).setUserName(username).setAction(action).build());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|