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

ios enrollment fixes

Browse Source 
Fixes https://gitlab.com/entgra/product-iots/-/issues/1184
This commit is contained in:
inoshperera 2021-11-16 10:37:13 +05:30
parent 731ae83bc4
commit fbfd9ba911
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
View File

@ -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) {

2
features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2
View File

@ -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>