shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-29 21:51:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(email): replace 'Enable SSL' setting with more descriptive/clear 'Encryption Method' setting (#1549)

Browse Source 
* feat(email): replace 'Enable SSL' setting with more descriptive/clear 'Encryption Method' setting

* fix: clarify settings & add true 'none' option
This commit is contained in:
TheCatLady
2021-05-04 06:31:33 -04:00
committed by GitHub
parent 11dc8ff92a
commit 69ab7cc660
5 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/components/Settings/Notifications/NotificationsEmail.tsx
View File

@@ -20,7 +20,13 @@ const messages = defineMessages({
emailsender: 'Sender Address',
smtpHost: 'SMTP Host',
smtpPort: 'SMTP Port',
enableSsl: 'Enable SSL',
encryption: 'Encryption Method',
encryptionTip:
'In most cases, Implicit TLS uses port 465 and STARTTLS uses port 587',
encryptionNone: 'None',
encryptionDefault: 'Use STARTTLS if available',
encryptionOpportunisticTls: 'Always use STARTTLS',
encryptionImplicitTls: 'Use Implicit TLS',
authUser: 'SMTP Username',
authPass: 'SMTP Password',
emailsettingssaved: 'Email notification settings saved successfully!',
@@ -29,8 +35,6 @@ const messages = defineMessages({
toastEmailTestSuccess: 'Email test notification sent!',
toastEmailTestFailed: 'Email test notification failed to send.',
allowselfsigned: 'Allow Self-Signed Certificates',
ssldisabletip:
'SSL should be disabled on standard TLS connections (port 587)',
senderName: 'Sender Name',
validationEmail: 'You must provide a valid email address',
emailNotificationTypesAlertDescription:
@@ -132,7 +136,13 @@ const NotificationsEmail: React.FC = () => {
emailFrom: data.options.emailFrom,
smtpHost: data.options.smtpHost,
smtpPort: data.options.smtpPort ?? 587,
secure: data.options.secure,
encryption: data.options.secure
? 'implicit'
: data.options.requireTls
? 'opportunistic'
: data.options.ignoreTls
? 'none'
: 'default',
authUser: data.options.authUser,
authPass: data.options.authPass,
allowSelfSigned: data.options.allowSelfSigned,
@@ -150,7 +160,9 @@ const NotificationsEmail: React.FC = () => {
emailFrom: values.emailFrom,
smtpHost: values.smtpHost,
smtpPort: Number(values.smtpPort),
secure: values.secure,
secure: values.encryption === 'implicit',
ignoreTls: values.encryption === 'none',
requireTls: values.encryption === 'opportunistic',
authUser: values.authUser,
authPass: values.authPass,
allowSelfSigned: values.allowSelfSigned,
@@ -196,7 +208,9 @@ const NotificationsEmail: React.FC = () => {
emailFrom: values.emailFrom,
smtpHost: values.smtpHost,
smtpPort: Number(values.smtpPort),
secure: values.secure,
secure: values.encryption === 'implicit',
ignoreTls: values.encryption === 'none',
requireTls: values.encryption === 'opportunistic',
authUser: values.authUser,
authPass: values.authPass,
senderName: values.senderName,
@@ -339,14 +353,29 @@ const NotificationsEmail: React.FC = () => {
</div>
</div>
<div className="form-row">
<label htmlFor="secure" className="checkbox-label">
<span>{intl.formatMessage(messages.enableSsl)}</span>
<span className="label-tip">
{intl.formatMessage(messages.ssldisabletip)}
</span>
<label htmlFor="encryption" className="text-label">
{intl.formatMessage(messages.encryption)}
<span className="label-required">*</span>
</label>
<div className="form-input">
<Field type="checkbox" id="secure" name="secure" />
<div className="form-input-field">
<Field as="select" id="encryption" name="encryption">
<option value="none">
{intl.formatMessage(messages.encryptionNone)}
</option>
<option value="default">
{intl.formatMessage(messages.encryptionDefault)}
</option>
<option value="opportunistic">
{intl.formatMessage(
messages.encryptionOpportunisticTls
)}
</option>
<option value="implicit">
{intl.formatMessage(messages.encryptionImplicitTls)}
</option>
</Field>
</div>
</div>
</div>
<div className="form-row">