Merged changes

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -51,6 +51,7 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
                     DeviceManagerUtil.registerDeviceType(deviceType);
                     DeviceManagementDataHolder.getInstance().setRequireDeviceAuthorization(deviceType,
                                                             provider.getDeviceManager().requireDeviceAuthorization());
+
                 }
             } catch (DeviceManagementException e) {
                 throw new DeviceManagementException("Error occurred while adding device management provider '" +
@@ -79,6 +80,13 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
                 try {
                     provider.init();
                     DeviceManagerUtil.registerDeviceType(provider.getType());
+                    //TODO:
+                    //This is a temporory fix.
+                    //windows and IOS cannot resolve user info by extracting certs
+                    //until fix that, use following variable to enable and disable of checking user authorization.
+
+                    DeviceManagementDataHolder.getInstance().setRequireDeviceAuthorization(provider.getType(),
+                                             provider.getDeviceManager().requireDeviceAuthorization());
                 } catch (Throwable e) {
                     /* Throwable is caught intentionally as failure of one plugin - due to invalid start up parameters,
                         etc - should not block the initialization of other device management providers */