summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-07-08 17:03:38 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-07-08 17:03:38 -0400
commitab831b88de3b9e8dafb39bebda43faa29ffc8475 (patch)
tree05e83596c5da2908577756c0cc826b3f37f3dbb0
parent2d1c0924eea25ceb5cf79a285511a7a577cbece0 (diff)
downloadchat-ab831b88de3b9e8dafb39bebda43faa29ffc8475.tar.gz
chat-ab831b88de3b9e8dafb39bebda43faa29ffc8475.tar.bz2
chat-ab831b88de3b9e8dafb39bebda43faa29ffc8475.zip
PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534)
-rw-r--r--webapp/components/admin_console/saml_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index 45135fba6..611c37192 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -166,7 +166,7 @@ export default class SamlSettings extends AdminSettings {
}
uploadingText={Utils.localizeMessage('admin.saml.uploading.certificate', 'Uploading Certificate...')}
disabled={!this.state.enable}
- fileType='.crt'
+ fileType='.crt,.cer'
onSubmit={this.uploadCertificate}
/>
);
@@ -260,7 +260,7 @@ export default class SamlSettings extends AdminSettings {
}
uploadingText={Utils.localizeMessage('admin.saml.uploading.certificate', 'Uploading Certificate...')}
disabled={!this.state.enable || !this.state.encrypt}
- fileType='.crt'
+ fileType='.crt,.cer'
onSubmit={this.uploadCertificate}
/>
);