Implement remaining email config
This commit is contained in:
1 parent
1794429cbe
commit
de3d38d891
8 files changed
+64
-18
No files matched your search
@@ -50,6 +50,8 @@ const SettingsEmail = ({
|
||||
const emailConfig = {
|
||||
systemEmailHost: settingsData?.settings?.systemEmailHost,
|
||||
systemEmailPort: settingsData?.settings?.systemEmailPort,
|
||||
systemEmailSecure: settingsData?.settings?.systemEmailSecure,
|
||||
systemEmailPool: settingsData?.settings?.systemEmailPool,
|
||||
systemEmailUser: settingsData?.settings?.systemEmailUser,
|
||||
systemEmailAddress: settingsData?.settings?.systemEmailAddress,
|
||||
systemEmailPassword: password || settingsData?.settings?.systemEmailPassword,
|
||||
@@ -110,6 +112,27 @@ const SettingsEmail = ({
|
||||
onChange={handleChange}
|
||||
/>
|
||||
</Box>
|
||||
<Box
|
||||
sx={{
|
||||
display: "flex",
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing(4),
|
||||
}}
|
||||
>
|
||||
<Typography>{t("settingsEmailSecure")}</Typography>
|
||||
<Switch
|
||||
name="systemEmailSecure"
|
||||
checked={settingsData?.settings?.systemEmailSecure ?? false}
|
||||
onChange={handleChange}
|
||||
/>
|
||||
<Typography>{t("settingsEmailPool")}</Typography>
|
||||
<Switch
|
||||
name="systemEmailPool"
|
||||
checked={settingsData?.settings?.systemEmailPool ?? false}
|
||||
onChange={handleChange}
|
||||
/>
|
||||
</Box>
|
||||
<Box>
|
||||
<Typography>{t("settingsEmailUser")}</Typography>
|
||||
<TextInput
|
||||
|
||||
@@ -67,7 +67,9 @@ const Settings = () => {
|
||||
if (
|
||||
name === "systemEmailIgnoreTLS" ||
|
||||
name === "systemEmailRequireTLS" ||
|
||||
name === "systemEmailRejectUnauthorized"
|
||||
name === "systemEmailRejectUnauthorized" ||
|
||||
name === "systemEmailSecure" ||
|
||||
name === "systemEmailPool"
|
||||
) {
|
||||
newValue = checked;
|
||||
}
|
||||
|
||||
@@ -1014,6 +1014,12 @@ class NetworkService {
|
||||
systemEmailPort: emailConfig.systemEmailPort,
|
||||
systemEmailAddress: emailConfig.systemEmailAddress,
|
||||
systemEmailPassword: emailConfig.systemEmailPassword,
|
||||
systemEmailSecure: emailConfig.systemEmailSecure,
|
||||
systemEmailPool: emailConfig.systemEmailPool,
|
||||
systemEmailIgnoreTLS: emailConfig.systemEmailIgnoreTLS,
|
||||
systemEmailRequireTLS: emailConfig.systemEmailRequireTLS,
|
||||
systemEmailRejectUnauthorized: emailConfig.systemEmailRejectUnauthorized,
|
||||
systemEmailTLSServername: emailConfig.systemEmailTLSServername,
|
||||
// Only include these if they are present
|
||||
...(emailConfig.systemEmailConnectionHost && {
|
||||
systemEmailConnectionHost: emailConfig.systemEmailConnectionHost,
|
||||
|
||||
@@ -290,6 +290,8 @@ const settingsValidation = joi.object({
|
||||
timezone: joi.string().allow("").optional(),
|
||||
systemEmailHost: joi.string().allow(""),
|
||||
systemEmailPort: joi.number().allow(null, ""),
|
||||
systemEmailSecure: joi.boolean().optional(),
|
||||
systemEmailPool: joi.boolean().optional(),
|
||||
systemEmailAddress: joi.string().allow(""),
|
||||
systemEmailPassword: joi.string().allow(""),
|
||||
systemEmailUser: joi.string().allow(""),
|
||||
|
||||
@@ -683,6 +683,8 @@
|
||||
"settingsEmailIgnoreTLS": "Ignore TLS",
|
||||
"settingsEmailRequireTLS": "Require TLS",
|
||||
"settingsEmailRejectUnauthorized": "Reject Unauthorized",
|
||||
"settingsEmailSecure": "Secure",
|
||||
"settingsEmailPool": "Pool",
|
||||
"state": "State",
|
||||
"statusBreadCrumbsStatusPages": "Status Pages",
|
||||
"statusBreadCrumbsDetails": "Details",
|
||||
|
||||
Reference in new issue
Block a user