diff options
Diffstat (limited to 'webapp/components/admin_console/email_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 81 |
1 files changed, 51 insertions, 30 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index ddfe3c38f..d7694ebb6 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -32,6 +32,7 @@ export default class EmailSettings extends AdminSettings { config.EmailSettings.FeedbackName = this.state.feedbackName; config.EmailSettings.FeedbackEmail = this.state.feedbackEmail; config.EmailSettings.FeedbackOrganization = this.state.feedbackOrganization; + config.EmailSettings.EnableSMTPAuth = this.state.enableSMTPAuth; config.EmailSettings.SMTPUsername = this.state.smtpUsername; config.EmailSettings.SMTPPassword = this.state.smtpPassword; config.EmailSettings.SMTPServer = this.state.smtpServer; @@ -56,6 +57,7 @@ export default class EmailSettings extends AdminSettings { feedbackName: config.EmailSettings.FeedbackName, feedbackEmail: config.EmailSettings.FeedbackEmail, feedbackOrganization: config.EmailSettings.FeedbackOrganization, + enableSMTPAuth: config.EmailSettings.EnableSMTPAuth, smtpUsername: config.EmailSettings.SMTPUsername, smtpPassword: config.EmailSettings.SMTPPassword, smtpServer: config.EmailSettings.SMTPServer, @@ -202,80 +204,99 @@ export default class EmailSettings extends AdminSettings { disabled={!this.state.sendEmailNotifications} /> <TextSetting - id='smtpUsername' + id='smtpServer' label={ <FormattedMessage - id='admin.email.smtpUsernameTitle' - defaultMessage='SMTP Server Username:' + id='admin.email.smtpServerTitle' + defaultMessage='SMTP Server:' /> } - placeholder={Utils.localizeMessage('admin.email.smtpUsernameExample', 'Ex: "admin@yourcompany.com", "AKIADTOVBGERKLCBV"')} + placeholder={Utils.localizeMessage('admin.email.smtpServerExample', 'Ex: "smtp.yourcompany.com", "email-smtp.us-east-1.amazonaws.com"')} helpText={ <FormattedMessage - id='admin.email.smtpUsernameDescription' - defaultMessage=' Obtain this credential from administrator setting up your email server.' + id='admin.email.smtpServerDescription' + defaultMessage='Location of SMTP email server.' /> } - value={this.state.smtpUsername} + value={this.state.smtpServer} onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> <TextSetting - id='smtpPassword' + id='smtpPort' label={ <FormattedMessage - id='admin.email.smtpPasswordTitle' - defaultMessage='SMTP Server Password:' + id='admin.email.smtpPortTitle' + defaultMessage='SMTP Server Port:' /> } - placeholder={Utils.localizeMessage('admin.email.smtpPasswordExample', 'Ex: "yourpassword", "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465", "587"')} helpText={ <FormattedMessage - id='admin.email.smtpPasswordDescription' - defaultMessage=' Obtain this credential from administrator setting up your email server.' + id='admin.email.smtpPortDescription' + defaultMessage='Port of SMTP email server.' /> } - value={this.state.smtpPassword} + value={this.state.smtpPort} + onChange={this.handleChange} + disabled={!this.state.sendEmailNotifications} + /> + <BooleanSetting + id='enableSMTPAuth' + label={ + <FormattedMessage + id='admin.email.enableSMTPAuthTitle' + defaultMessage='Enable SMTP Authentication: ' + /> + } + helpText={[ + <FormattedHTMLMessage + key='admin.email.enableSMTPAuthDesc' + id='admin.email.enableSMTPAuthDesc' + defaultMessage='When true, SMTP Authentication is enabled.' + /> + ]} + value={this.state.enableSMTPAuth} onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> <TextSetting - id='smtpServer' + id='smtpUsername' label={ <FormattedMessage - id='admin.email.smtpServerTitle' - defaultMessage='SMTP Server:' + id='admin.email.smtpUsernameTitle' + defaultMessage='SMTP Server Username:' /> } - placeholder={Utils.localizeMessage('admin.email.smtpServerExample', 'Ex: "smtp.yourcompany.com", "email-smtp.us-east-1.amazonaws.com"')} + placeholder={Utils.localizeMessage('admin.email.smtpUsernameExample', 'Ex: "admin@yourcompany.com", "AKIADTOVBGERKLCBV"')} helpText={ <FormattedMessage - id='admin.email.smtpServerDescription' - defaultMessage='Location of SMTP email server.' + id='admin.email.smtpUsernameDescription' + defaultMessage=' Obtain this credential from administrator setting up your email server.' /> } - value={this.state.smtpServer} + value={this.state.smtpUsername} onChange={this.handleChange} - disabled={!this.state.sendEmailNotifications} + disabled={!this.state.sendEmailNotifications || !this.state.enableSMTPAuth} /> <TextSetting - id='smtpPort' + id='smtpPassword' label={ <FormattedMessage - id='admin.email.smtpPortTitle' - defaultMessage='SMTP Server Port:' + id='admin.email.smtpPasswordTitle' + defaultMessage='SMTP Server Password:' /> } - placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465", "587"')} + placeholder={Utils.localizeMessage('admin.email.smtpPasswordExample', 'Ex: "yourpassword", "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ <FormattedMessage - id='admin.email.smtpPortDescription' - defaultMessage='Port of SMTP email server.' + id='admin.email.smtpPasswordDescription' + defaultMessage=' Obtain this credential from administrator setting up your email server.' /> } - value={this.state.smtpPort} + value={this.state.smtpPassword} onChange={this.handleChange} - disabled={!this.state.sendEmailNotifications} + disabled={!this.state.sendEmailNotifications || !this.state.enableSMTPAuth} /> <ConnectionSecurityDropdownSettingEmail value={this.state.connectionSecurity} |