PLT-3629 fix uploading certificates if the files in the config do not exists (#3634)

2 files changed, 33 insertions, 0 deletions

diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx
index 5ee28be78..88da51372 100644
--- a/webapp/client/client.jsx
+++ b/webapp/client/client.jsx
@@ -1667,4 +1667,17 @@ export default class Client {
         send({filename}).
         end(this.handleResponse.bind(this, 'removeCertificateFile', success, error));
     }
+
+    samlCertificateStatus(success, error) {
+        request.get(`${this.getAdminRoute()}/saml_cert_status`).
+        set(this.defaultHeaders).
+        type('application/json').
+        accept('application/json').
+        end((err, res) => {
+            if (err) {
+                return error(err);
+            }
+            return success(res.body);
+        });
+    }
 }
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index ae6f3e169..9fb78f472 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -70,6 +70,26 @@ export default class SamlSettings extends AdminSettings {
         };
     }
 
+    componentWillMount() {
+        Client.samlCertificateStatus(
+            (data) => {
+                const files = {};
+                if (!data.IdpCertificateFile) {
+                    files.idpCertificateFile = '';
+                }
+
+                if (!data.PublicCertificateFile) {
+                    files.publicCertificateFile = '';
+                }
+
+                if (!data.PrivateKeyFile) {
+                    files.privateKeyFile = '';
+                }
+                this.setState(files);
+            }
+        );
+    }
+
     uploadCertificate(id, file, callback) {
         Client.uploadCertificateFile(
             file,