1 files changed, 23 insertions, 21 deletions

diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index db841aa83..45135fba6 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -24,27 +24,6 @@ export default class SamlSettings extends AdminSettings {
         this.renderSettings = this.renderSettings.bind(this);
         this.uploadCertificate = this.uploadCertificate.bind(this);
         this.removeCertificate = this.removeCertificate.bind(this);
-
-        const settings = props.config.SamlSettings;
-
-        this.state = Object.assign(this.state, {
-            enable: settings.Enable,
-            verify: settings.Verify,
-            encrypt: settings.Encrypt,
-            idpUrl: settings.IdpUrl,
-            idpDescriptorUrl: settings.IdpDescriptorUrl,
-            assertionConsumerServiceURL: settings.AssertionConsumerServiceURL,
-            idpCertificateFile: settings.IdpCertificateFile,
-            publicCertificateFile: settings.PublicCertificateFile,
-            privateKeyFile: settings.PrivateKeyFile,
-            firstNameAttribute: settings.FirstNameAttribute,
-            lastNameAttribute: settings.LastNameAttribute,
-            emailAttribute: settings.EmailAttribute,
-            usernameAttribute: settings.UsernameAttribute,
-            nicknameAttribute: settings.NicknameAttribute,
-            localeAttribute: settings.LocaleAttribute,
-            loginButtonText: settings.LoginButtonText
-        });
     }
 
     getConfigFromState(config) {
@@ -68,6 +47,29 @@ export default class SamlSettings extends AdminSettings {
         return config;
     }
 
+    getStateFromConfig(config) {
+        const settings = config.SamlSettings;
+
+        return {
+            enable: settings.Enable,
+            verify: settings.Verify,
+            encrypt: settings.Encrypt,
+            idpUrl: settings.IdpUrl,
+            idpDescriptorUrl: settings.IdpDescriptorUrl,
+            assertionConsumerServiceURL: settings.AssertionConsumerServiceURL,
+            idpCertificateFile: settings.IdpCertificateFile,
+            publicCertificateFile: settings.PublicCertificateFile,
+            privateKeyFile: settings.PrivateKeyFile,
+            firstNameAttribute: settings.FirstNameAttribute,
+            lastNameAttribute: settings.LastNameAttribute,
+            emailAttribute: settings.EmailAttribute,
+            usernameAttribute: settings.UsernameAttribute,
+            nicknameAttribute: settings.NicknameAttribute,
+            localeAttribute: settings.LocaleAttribute,
+            loginButtonText: settings.LoginButtonText
+        };
+    }
+
     uploadCertificate(id, file, callback) {
         Client.uploadCertificateFile(
             file,