From 6fbfbb17cef3ea501e79fed2a360a7925aa52cea Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Wed, 20 Sep 2023 11:18:54 +0200
Subject: [PATCH] RED-6903 - Adjust failure message to allow different username
 and from email

---
 .../tenantusermanagement/service/EmailService.java  |  3 ---
 .../fforesight/tests/SMTPConfigurationTest.java     | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java
index c02452a..dce6b25 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java
@@ -57,9 +57,6 @@ public class EmailService {
 
             if (auth) {
                 props.setProperty("mail.smtp.auth", "true");
-                if (!config.get("user").equals(address)) {
-                    throw new BadRequestException("User and from email should be the same");
-                }
             }
 
             if (ssl) {
diff --git a/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java b/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java
index e85546b..2af22c2 100644
--- a/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java
+++ b/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java
@@ -55,19 +55,6 @@ public class SMTPConfigurationTest extends AbstractTenantUserManagementIntegrati
         TenantContext.clear();
     }
 
-    @Test
-    public void testSMTPConnectionWithDifferentEmails() {
-
-        TenantContext.setTenantId(AbstractTenantUserManagementIntegrationTest.TEST_TENANT_ID);
-
-        SMTPConfiguration smtpConfiguration = provideTestSMTPConfiguration();
-        smtpConfiguration.setUser("invalid");
-
-        assertThatThrownBy(() -> smtpConfigurationClient.testSMTPConfiguration(smtpConfiguration)).hasMessageContaining("User and from email should be the same");
-
-        TenantContext.clear();
-    }
-
     private SMTPConfiguration provideTestSMTPConfiguration() {
 
         SMTPConfiguration smtpConfiguration = new SMTPConfiguration();