Merge pull request #2588 from hmhealey/plt2490

PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available

webapp/components/admin_console/service_settings.jsx

@@ -84,10 +84,13 @@ class ServiceSettings extends React.Component {
         config.ServiceSettings.EnableDeveloper = ReactDOM.findDOMNode(this.refs.EnableDeveloper).checked;
         config.ServiceSettings.EnableSecurityFixAlert = ReactDOM.findDOMNode(this.refs.EnableSecurityFixAlert).checked;
         config.ServiceSettings.EnableInsecureOutgoingConnections = ReactDOM.findDOMNode(this.refs.EnableInsecureOutgoingConnections).checked;
-        config.ServiceSettings.EnableMultifactorAuthentication = ReactDOM.findDOMNode(this.refs.EnableMultifactorAuthentication).checked;
         config.ServiceSettings.EnableCommands = ReactDOM.findDOMNode(this.refs.EnableCommands).checked;
         config.ServiceSettings.EnableOnlyAdminIntegrations = ReactDOM.findDOMNode(this.refs.EnableOnlyAdminIntegrations).checked;
 
+        if (this.refs.EnablMultifactorAuthentication) {
+            config.ServiceSettings.EnableMultifactorAuthentication = ReactDOM.findDOMNode(this.refs.EnableMultifactorAuthentication).checked;
+        }
+
         //config.ServiceSettings.EnableOAuthServiceProvider = ReactDOM.findDOMNode(this.refs.EnableOAuthServiceProvider).checked;
 
         var MaximumLoginAttempts = DefaultMaximumLoginAttempts;

webapp/components/logged_in.jsx

@@ -266,7 +266,10 @@ LoggedIn.defaultProps = {
 };
 
 LoggedIn.propTypes = {
-    children: React.PropTypes.arrayOf(React.PropTypes.element),
+    children: React.PropTypes.oneOfType([
+        React.PropTypes.arrayOf(React.PropTypes.element),
+        React.PropTypes.element
+    ]),
     navbar: React.PropTypes.element,
     sidebar: React.PropTypes.element,
     center: React.PropTypes.element,