From a3a381aad14a1e7da542e6e7064ad41ca830aea7 Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Thu, 15 May 2025 14:27:08 +0200
Subject: [PATCH] fix: removed env variable, configured a form field for
 editing email connect host

---
 client/src/Pages/Settings/SettingsEmail.jsx | 9 +++++++++
 client/src/Validation/validation.js         | 1 +
 client/src/locales/gb.json                  | 1 +
 server/db/models/AppSettings.js             | 3 +++
 server/service/settingsService.js           | 1 -
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 694219614..46430e2e5 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -122,6 +122,15 @@ const SettingsEmail = ({
 							</Button>
 						</Box>
 					)}
+					<Box>
+						<Typography>{t("systemEmailConnectionHost")}</Typography>
+						<TextInput
+							name="systemEmailConnectionHost"
+							placeholder="bluewavelabs.ca"
+							value={settingsData?.settings?.systemEmailConnectionHost ?? ""}
+							onChange={handleChange}
+						/>
+					</Box>
 					<Box>
 						<Button
 							variant="contained"
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 096db1a1a..5bde16ca9 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -307,6 +307,7 @@ const advancedSettingsValidation = joi.object({
 	systemEmailPort: joi.number().allow(null, ""),
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow(""),
 	jwtTTLNum: joi.number().messages({
 		"number.base": "JWT TTL is required.",
 	}),
diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json
index 3391baec7..16d62ab6d 100644
--- a/client/src/locales/gb.json
+++ b/client/src/locales/gb.json
@@ -120,6 +120,7 @@
 	"settingsEmailPassword": "Email password",
 	"settingsEmailUser": "Email user",
 	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
+	"systemEmailConnectionHost":"Email connection host",
 	"backendUnreachable": "Server Connection Error",
 	"backendUnreachableMessage": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
 	"backendUnreachableError": "Cannot connect to the server. Please try again later.",
diff --git a/server/db/models/AppSettings.js b/server/db/models/AppSettings.js
index 22e586131..7875537ec 100755
--- a/server/db/models/AppSettings.js
+++ b/server/db/models/AppSettings.js
@@ -28,6 +28,9 @@ const AppSettingsSchema = mongoose.Schema(
 		systemEmailUser: {
 			type: String,
 		},
+		systemEmailConnectionHost: {
+			type: String,
+		},
 		singleton: {
 			type: Boolean,
 			required: true,
diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 9dd9dcabe..bc314abff 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -7,7 +7,6 @@ const envConfig = {
 	systemEmailUser: process.env.SYSTEM_EMAIL_USER,
 	systemEmailAddress: process.env.SYSTEM_EMAIL_ADDRESS,
 	systemEmailPassword: process.env.SYSTEM_EMAIL_PASSWORD,
-	systemEmailConnectionHost: process.env.SYSTEM_EMAIL_CONNECTION_HOST,
 	jwtSecret: process.env.JWT_SECRET,
 	jwtTTL: process.env.TOKEN_TTL,
 	clientHost: process.env.CLIENT_HOST,