Merge branch 'ios-500' into 'master'

ios enrollment fixes

See merge request entgra/carbon-device-mgt!819
feature/traccar-sync
Pahansith Gunathilake 3 years ago
commit 5da6c70502

@ -116,7 +116,9 @@ public class CertificateAuthenticator implements WebappAuthenticator {
deviceIdentifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_IOS); deviceIdentifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_IOS);
TenantedDeviceWrapper tenantedDeviceWrapper = scepManager.getValidatedDevice(deviceIdentifier); TenantedDeviceWrapper tenantedDeviceWrapper = scepManager.getValidatedDevice(deviceIdentifier);
authenticationInfo.setTenantDomain(tenantedDeviceWrapper.getTenantDomain()); authenticationInfo.setTenantDomain(tenantedDeviceWrapper.getTenantDomain());
authenticationInfo.setTenantId(tenantedDeviceWrapper.getTenantId()); // To make sure the tenant flow is not initiated in the valve as the
// tenant flows are initiated at the API level on iOS
authenticationInfo.setTenantId(-1);
if (tenantedDeviceWrapper.getDevice() != null && if (tenantedDeviceWrapper.getDevice() != null &&
tenantedDeviceWrapper.getDevice().getEnrolmentInfo() != null) { tenantedDeviceWrapper.getDevice().getEnrolmentInfo() != null) {

@ -44,7 +44,7 @@
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
{% if device_mgt_conf.push_notification_conf.push_notification_providers is defined %} {% if device_mgt_conf.push_notification_conf.push_notification_providers is defined %}
{%- for push_notification_provider in device_mgt_conf.push_notification_conf.push_notification_providers -%} {%- for push_notification_provider in device_mgt_conf.push_notification_conf.push_notification_providers -%}
<Provider>{{push_notification_provider}}</Provider> <Provider>{{push_notification_provider.name}}</Provider>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</PushNotificationProviders> </PushNotificationProviders>

Loading…
Cancel
Save