From 3faa6194f39e2091bd7a622bb66d20acbc3ccd7c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 23 Jun 2025 10:02:06 +0800 Subject: [PATCH 1/3] display transport settings --- client/src/Components/TextLink/index.jsx | 4 +- client/src/Pages/Settings/SettingsEmail.jsx | 44 ++++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/client/src/Components/TextLink/index.jsx b/client/src/Components/TextLink/index.jsx index a10839e84..83ae251a5 100644 --- a/client/src/Components/TextLink/index.jsx +++ b/client/src/Components/TextLink/index.jsx @@ -5,7 +5,7 @@ import PropTypes from "prop-types"; import { useTheme } from "@emotion/react"; import { Link as RouterLink } from "react-router-dom"; -const TextLink = ({ text, linkText, href }) => { +const TextLink = ({ text, linkText, href, target = "_self" }) => { const theme = useTheme(); return ( @@ -18,6 +18,7 @@ const TextLink = ({ text, linkText, href }) => { color="accent" to={href} component={RouterLink} + target={target} > {linkText} @@ -29,6 +30,7 @@ TextLink.propTypes = { text: PropTypes.string, linkText: PropTypes.string, href: PropTypes.string, + target: PropTypes.string, }; export default TextLink; diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx index 061cf2602..07ee050bb 100644 --- a/client/src/Pages/Settings/SettingsEmail.jsx +++ b/client/src/Pages/Settings/SettingsEmail.jsx @@ -4,6 +4,8 @@ import ConfigBox from "../../Components/ConfigBox"; import TextInput from "../../Components/Inputs/TextInput"; import Button from "@mui/material/Button"; import Stack from "@mui/material/Stack"; +import { Switch } from "@mui/material"; +import TextLink from "../../Components/TextLink"; // Utils import { useTheme } from "@emotion/react"; import { PropTypes } from "prop-types"; @@ -12,7 +14,6 @@ import { useTranslation } from "react-i18next"; import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments"; import { useSendTestEmail } from "../../Hooks/useSendTestEmail"; import { createToast } from "../../Utils/toastUtils"; -import { Switch } from "@mui/material"; const SettingsEmail = ({ isAdmin, @@ -239,6 +240,47 @@ const SettingsEmail = ({ /> ))} + + + + + {JSON.stringify( + { + host: systemEmailHost, + port: systemEmailPort, + secure: systemEmailSecure, + auth: { + user: systemEmailUser || systemEmailAddress, + pass: "", + }, + name: systemEmailConnectionHost || "localhost", + pool: systemEmailPool, + user: systemEmailUser, + tls: { + rejectUnauthorized: systemEmailRejectUnauthorized, + ignoreTLS: systemEmailIgnoreTLS, + requireTLS: systemEmailRequireTLS, + servername: systemEmailTLSServername, + }, + }, + null, + 2 + )} + + From 766c073ec4014ab1f361fb74d8bb0db74d2262c2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 23 Jun 2025 10:05:06 +0800 Subject: [PATCH 2/3] localisation --- client/src/Pages/Settings/SettingsEmail.jsx | 4 ++-- client/src/locales/en.json | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx index 07ee050bb..c63b9edf5 100644 --- a/client/src/Pages/Settings/SettingsEmail.jsx +++ b/client/src/Pages/Settings/SettingsEmail.jsx @@ -242,8 +242,8 @@ const SettingsEmail = ({ ))} diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 14317e689..f677c346c 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -450,6 +450,8 @@ "settingsEmailPassword": "Email password - Password for authentication", "settingsEmailUser": "Email user - Username for authentication, overrides email address if specified", "settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.", + "settingsEmailTransportLinkDescription": "This builds an SMTP transport for NodeMailer", + "settingsEmailTransportLinkText": "See specifications here", "state": "State", "statusBreadCrumbsStatusPages": "Status Pages", "statusBreadCrumbsDetails": "Details", From bf73a715234f4819e7417980fad588322e401670 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 23 Jun 2025 14:48:45 +0800 Subject: [PATCH 3/3] remove duplicate user --- client/src/Pages/Settings/SettingsEmail.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx index c63b9edf5..1ae4a1f02 100644 --- a/client/src/Pages/Settings/SettingsEmail.jsx +++ b/client/src/Pages/Settings/SettingsEmail.jsx @@ -268,7 +268,6 @@ const SettingsEmail = ({ }, name: systemEmailConnectionHost || "localhost", pool: systemEmailPool, - user: systemEmailUser, tls: { rejectUnauthorized: systemEmailRejectUnauthorized, ignoreTLS: systemEmailIgnoreTLS,