From 8c64221f88654509e74d4baa8831f3f4cedf432d Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Tue, 13 May 2025 16:21:30 +0200
Subject: [PATCH 1/6] fix: configuring gmail smtp relay without any
 authentication

---
 server/service/emailService.js    | 12 +++++++++++-
 server/service/settingsService.js |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/service/emailService.js b/server/service/emailService.js
index 94d19f0f4..03e9cdebe 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -96,9 +96,10 @@ class EmailService {
 			systemEmailUser,
 			systemEmailAddress,
 			systemEmailPassword,
+			systemEmailConnectionHost
 		} = await this.settingsService.getDBSettings();
 
-		const emailConfig = {
+		const baseEmailConfig = {
 			host: systemEmailHost,
 			port: systemEmailPort,
 			secure: true,
@@ -109,6 +110,15 @@ class EmailService {
 			connectionTimeout: 5000,
 		};
 
+		const emailConfig = systemEmailPort === "465" ? baseEmailConfig : {
+			...baseEmailConfig,
+			name: systemEmailConnectionHost,
+			secure: false,
+			pool: true,
+			tls: { rejectUnauthorized: false },
+			auth: null
+		};
+
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 
 		const buildHtml = async (template, context) => {
diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 290e645e9..bde361f80 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -7,6 +7,7 @@ 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,

From 12925c515aceffce215258605e5ca52303b1cbde Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Tue, 13 May 2025 18:07:53 +0200
Subject: [PATCH 2/6] fix: configuring gmail smtp relay without any
 authentication

---
 server/service/emailService.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/service/emailService.js b/server/service/emailService.js
index 03e9cdebe..bdd727813 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -110,14 +110,19 @@ class EmailService {
 			connectionTimeout: 5000,
 		};
 
-		const emailConfig = systemEmailPort === "465" ? baseEmailConfig : {
+		const isSmtps = Number(systemEmailPort) === 465;
+
+		const emailConfig = !isSmtps ? {
 			...baseEmailConfig,
 			name: systemEmailConnectionHost,
 			secure: false,
 			pool: true,
 			tls: { rejectUnauthorized: false },
-			auth: null
-		};
+		} : baseEmailConfig;
+
+		if (!isSmtps) {
+			delete emailConfig.auth;
+		}
 
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 

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 3/6] 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,

From 7327f24c476ab1d16808872d221c20914db84723 Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Thu, 15 May 2025 14:38:20 +0200
Subject: [PATCH 4/6] fix: added email connection validation

---
 client/src/Validation/validation.js | 3 ++-
 server/service/emailService.js      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 5bde16ca9..d8b6d09cd 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -278,6 +278,7 @@ const settingsValidation = joi.object({
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow("").optional(),
 });
 
 const dayjsValidator = (value, helpers) => {
@@ -307,7 +308,7 @@ const advancedSettingsValidation = joi.object({
 	systemEmailPort: joi.number().allow(null, ""),
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
-	systemEmailConnectionHost: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow("").optional(),
 	jwtTTLNum: joi.number().messages({
 		"number.base": "JWT TTL is required.",
 	}),
diff --git a/server/service/emailService.js b/server/service/emailService.js
index bdd727813..4a09d46f1 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -114,7 +114,7 @@ class EmailService {
 
 		const emailConfig = !isSmtps ? {
 			...baseEmailConfig,
-			name: systemEmailConnectionHost,
+			name: systemEmailConnectionHost || "127.0.0.1",
 			secure: false,
 			pool: true,
 			tls: { rejectUnauthorized: false },

From e6b823d89e582403dc21da36f4429373bfe2eb74 Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Thu, 15 May 2025 15:16:36 +0200
Subject: [PATCH 5/6] fix: added email connection validation

---
 client/src/Validation/validation.js |  4 ++--
 server/db/models/AppSettings.js     |  1 +
 server/service/emailService.js      | 20 ++++++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index d8b6d09cd..003523c60 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -278,7 +278,7 @@ const settingsValidation = joi.object({
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
-	systemEmailConnectionHost: joi.string().allow("").optional(),
+	systemEmailConnectionHost: joi.string().allow(""),
 });
 
 const dayjsValidator = (value, helpers) => {
@@ -308,7 +308,7 @@ const advancedSettingsValidation = joi.object({
 	systemEmailPort: joi.number().allow(null, ""),
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
-	systemEmailConnectionHost: joi.string().allow("").optional(),
+	systemEmailConnectionHost: joi.string().allow(""),
 	jwtTTLNum: joi.number().messages({
 		"number.base": "JWT TTL is required.",
 	}),
diff --git a/server/db/models/AppSettings.js b/server/db/models/AppSettings.js
index 7875537ec..c47de06fa 100755
--- a/server/db/models/AppSettings.js
+++ b/server/db/models/AppSettings.js
@@ -30,6 +30,7 @@ const AppSettingsSchema = mongoose.Schema(
 		},
 		systemEmailConnectionHost: {
 			type: String,
+			default: "localhost",
 		},
 		singleton: {
 			type: Boolean,
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 4a09d46f1..b3e087046 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -11,6 +11,7 @@ const SERVICE_NAME = "EmailService";
  */
 class EmailService {
 	static SERVICE_NAME = SERVICE_NAME;
+
 	/**
 	 * Constructs an instance of the EmailService, initializing template loaders and the email transporter.
 	 * @param {Object} settingsService - The settings service to get email configuration.
@@ -96,7 +97,7 @@ class EmailService {
 			systemEmailUser,
 			systemEmailAddress,
 			systemEmailPassword,
-			systemEmailConnectionHost
+			systemEmailConnectionHost,
 		} = await this.settingsService.getDBSettings();
 
 		const baseEmailConfig = {
@@ -112,13 +113,15 @@ class EmailService {
 
 		const isSmtps = Number(systemEmailPort) === 465;
 
-		const emailConfig = !isSmtps ? {
-			...baseEmailConfig,
-			name: systemEmailConnectionHost || "127.0.0.1",
-			secure: false,
-			pool: true,
-			tls: { rejectUnauthorized: false },
-		} : baseEmailConfig;
+		const emailConfig = !isSmtps
+			? {
+					...baseEmailConfig,
+					name: systemEmailConnectionHost || "localhost",
+					secure: false,
+					pool: true,
+					tls: { rejectUnauthorized: false },
+				}
+			: baseEmailConfig;
 
 		if (!isSmtps) {
 			delete emailConfig.auth;
@@ -164,4 +167,5 @@ class EmailService {
 		return info?.messageId;
 	};
 }
+
 export default EmailService;

From 8888a007f246ee1b020050183f5da588b4669922 Mon Sep 17 00:00:00 2001
From: Cahit Atilgan <ca@nextension.com>
Date: Thu, 15 May 2025 15:30:04 +0200
Subject: [PATCH 6/6] fix: added email connection validation (server side)

---
 server/validation/joi.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/validation/joi.js b/server/validation/joi.js
index 997d35d65..3dfee80c4 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -432,6 +432,7 @@ const updateAppSettingsBodyValidation = joi.object({
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow(""),
 });
 
 //****************************************