From b57bf2878179a346201046662f12480ac1846eeb Mon Sep 17 00:00:00 2001 From: Johan Ejdemark Date: Sat, 19 Oct 2024 22:22:18 +0200 Subject: [PATCH] Fix email sender address issue Fixes #9878 Update `TbMailSender` to correctly handle the `mailFrom` field in the email configuration. * Checks the `mailFrom` field in the JSON configuration and set it as the sender address if present. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/thingsboard/thingsboard/issues/9878?shareId=XXXX-XXXX-XXXX-XXXX). --- .../java/org/thingsboard/server/service/mail/TbMailSender.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java index 10586bc41a..93ac09b0fc 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java @@ -67,6 +67,9 @@ public class TbMailSender extends JavaMailSenderImpl { if (jsonConfig.has("password")) { setPassword(jsonConfig.get("password").asText()); } + if (jsonConfig.has("mailFrom")) { + setUsername(jsonConfig.get("mailFrom").asText()); + } setJavaMailProperties(createJavaMailProperties(jsonConfig)); }